From e8418c8f282465df4ef8feddff7e6dc2b08abb9f Mon Sep 17 00:00:00 2001 From: Samuel Furter Date: Thu, 4 Apr 2019 17:24:40 +0200 Subject: [PATCH] code style improvements --- .../lib/methods/AbstractMethod.js | 9 +++++---- .../src/observers/TransactionObserver.js | 13 +------------ .../tests/src/providers/IpcProviderTest.js | 2 +- packages/web3-utils/src/Utils.js | 18 +++++++++--------- packages/web3-utils/src/index.js | 14 +++++++------- 5 files changed, 23 insertions(+), 33 deletions(-) diff --git a/packages/web3-core-method/lib/methods/AbstractMethod.js b/packages/web3-core-method/lib/methods/AbstractMethod.js index 0c5869241a4..6bcf491ea17 100644 --- a/packages/web3-core-method/lib/methods/AbstractMethod.js +++ b/packages/web3-core-method/lib/methods/AbstractMethod.js @@ -52,7 +52,8 @@ export default class AbstractMethod { * * @param {AbstractWeb3Module} moduleInstance - The package where the method is called from for example Eth. */ - beforeExecution(moduleInstance) {} + beforeExecution(moduleInstance) { + } /** * This method will be executed after the RPC request. @@ -200,13 +201,13 @@ export default class AbstractMethod { * * @param {IArguments} args */ - setArguments(arguments_) { - let parameters = cloneDeep([...arguments_]); + setArguments(args) { + let parameters = cloneDeep([...args]); let callback = null; if (parameters.length > this.parametersAmount) { if (!isFunction(parameters[parameters.length - 1])) { - throw new TypeError("The latest parameter should be a function otherwise it can't be used as callback"); + throw new TypeError('The latest parameter should be a function otherwise it can\'t be used as callback'); } callback = parameters.pop(); diff --git a/packages/web3-core-method/src/observers/TransactionObserver.js b/packages/web3-core-method/src/observers/TransactionObserver.js index c12c607222d..c89de33e5af 100644 --- a/packages/web3-core-method/src/observers/TransactionObserver.js +++ b/packages/web3-core-method/src/observers/TransactionObserver.js @@ -63,7 +63,7 @@ export default class TransactionObserver { */ observe(transactionHash) { return Observable.create((observer) => { - if (this.isSocketBasedProvider()) { + if (this.provider.supportsSubscriptions()) { this.startSocketObserver(transactionHash, observer); } else { this.startHttpObserver(transactionHash, observer); @@ -270,17 +270,6 @@ export default class TransactionObserver { return this.confirmationChecks === this.timeout; } - /** - * Checks if the given provider is a socket based provider. - * - * @method isSocketBasedProvider - * - * @returns {Boolean} - */ - isSocketBasedProvider() { - return !!this.provider.supportsSubscriptions(); - } - /** * Increases the blockNumber hash by one. * diff --git a/packages/web3-providers/tests/src/providers/IpcProviderTest.js b/packages/web3-providers/tests/src/providers/IpcProviderTest.js index a45f5ce78d8..367ce396af2 100644 --- a/packages/web3-providers/tests/src/providers/IpcProviderTest.js +++ b/packages/web3-providers/tests/src/providers/IpcProviderTest.js @@ -81,7 +81,7 @@ describe('IpcProviderTest', () => { ipcProvider.onMessage(objectWithToString); - expect(objectWithToString.toString).toHaveBeenCalledWith(); + expect(objectWithToString.toString).toHaveBeenCalled(); }); it('calls onMessage with more than one chunk', (done) => { diff --git a/packages/web3-utils/src/Utils.js b/packages/web3-utils/src/Utils.js index c3468d60471..97e1ad300c6 100644 --- a/packages/web3-utils/src/Utils.js +++ b/packages/web3-utils/src/Utils.js @@ -181,30 +181,30 @@ export const rightPad = (string, chars, sign) => { * * @method utf8ToHex * - * @param {String} str + * @param {String} value * * @returns {String} hex representation of input string */ -export const utf8ToHex = (string) => { - string = utf8.encode(string); +export const utf8ToHex = (value) => { + value = utf8.encode(string); let hex = ''; /* eslint-disable no-control-regex */ // remove \u0000 padding from either side - string = string.replace(/^(?:\u0000)*/, ''); - string = string + value = value.replace(/^(?:\u0000)*/, ''); + value = value .split('') .reverse() .join(''); - string = string.replace(/^(?:\u0000)*/, ''); - string = string + value = value.replace(/^(?:\u0000)*/, ''); + value = value .split('') .reverse() .join(''); /* eslint-enable no-control-regex */ - for (let i = 0; i < string.length; i++) { - const code = string.charCodeAt(i); + for (let i = 0; i < value.length; i++) { + const code = value.charCodeAt(i); // if (code !== 0) { const n = code.toString(16); hex += n.length < 2 ? `0${n}` : n; diff --git a/packages/web3-utils/src/index.js b/packages/web3-utils/src/index.js index ebe8f6d7a07..a05eefda62e 100644 --- a/packages/web3-utils/src/index.js +++ b/packages/web3-utils/src/index.js @@ -104,7 +104,7 @@ const _flattenTypes = (includeTuple, puts) => { export const hexToAscii = (hex) => { if (!utils.isHexStrict(hex)) throw new Error('The parameter must be a valid HEX string.'); - let string = ''; + let value = ''; let i = 0; const l = hex.length; @@ -114,10 +114,10 @@ export const hexToAscii = (hex) => { } for (; i < l; i += 2) { const code = parseInt(hex.substr(i, 2), 16); - string += String.fromCharCode(code); + value += String.fromCharCode(code); } - return string; + return value; }; /** @@ -125,16 +125,16 @@ export const hexToAscii = (hex) => { * * @method asciiToHex * - * @param {String} str + * @param {String} value * @param {Number} length * * @returns {String} hex representation of input string */ -export const asciiToHex = (string, length = 32) => { +export const asciiToHex = (value, length = 32) => { let hex = ''; - for (let i = 0; i < string.length; i++) { - const code = string.charCodeAt(i); + for (let i = 0; i < value.length; i++) { + const code = value.charCodeAt(i); const n = code.toString(16); hex += n.length < 2 ? `0${n}` : n; }