Parameters amount in EcRecoverMethod fixed, PersonalSignMethod optional parameter password fixed, and related tests updated

Author: Samuel Furter

packages/web3-core-method/src/methods/personal/EcRecoverMethod.js

@@ -31,7 +31,7 @@ export default class EcRecoverMethod extends AbstractMethod {
      * @constructor
      */
     constructor(utils, formatters, moduleInstance) {
-        super('personal_ecRecover', 3, utils, formatters, moduleInstance);
+        super('personal_ecRecover', 2, utils, formatters, moduleInstance);
     }
 
     /**

packages/web3-core-method/src/methods/personal/PersonalSignMethod.js

@@ -20,6 +20,7 @@
  * @date 2018
  */
 
+import isFunction from 'lodash/isFunction'
 import AbstractMethod from '../../../lib/methods/AbstractMethod';
 
 export default class PersonalSignMethod extends AbstractMethod {
@@ -44,5 +45,10 @@ export default class PersonalSignMethod extends AbstractMethod {
     beforeExecution(moduleInstance) {
         this.parameters[0] = this.formatters.inputSignFormatter(this.parameters[0]);
         this.parameters[1] = this.formatters.inputAddressFormatter(this.parameters[1]);
+
+        if (isFunction(this.parameters[2])) {
+            this.callback = this.parameters[2];
+            delete this.parameters[2];
+        }
     }
 }

packages/web3-core-method/tests/src/methods/personal/EcRecoverMethodTest.js

@@ -20,7 +20,7 @@ describe('EcRecoverMethodTest', () => {
 
         expect(method.rpcMethod).toEqual('personal_ecRecover');
 
-        expect(method.parametersAmount).toEqual(3);
+        expect(method.parametersAmount).toEqual(2);
 
         expect(method.utils).toEqual(null);
 

packages/web3-core-method/tests/src/methods/personal/PersonalSignMethodTest.js

@@ -44,4 +44,27 @@ describe('PersonalSignMethodTest', () => {
 
         expect(formatters.inputAddressFormatter).toHaveBeenCalledWith('0x0');
     });
+
+    it('calls beforeExecution with a callback instead of the optional paramter and it calls the inputSignFormatter and inputAddressFormatter', () => {
+        const callback = jest.fn();
+        method.parameters = ['sign', '0x0', callback];
+
+        formatters.inputSignFormatter.mockReturnValueOnce('signed');
+
+        formatters.inputAddressFormatter.mockReturnValueOnce('0x00');
+
+        method.beforeExecution({defaultBlock: 'latest'});
+
+        expect(method.callback).toEqual(callback);
+
+        expect(method.parameters[0]).toEqual('signed');
+
+        expect(method.parameters[1]).toEqual('0x00');
+
+        expect(method.parameters[2]).toEqual(undefined);
+
+        expect(formatters.inputSignFormatter).toHaveBeenCalledWith('sign');
+
+        expect(formatters.inputAddressFormatter).toHaveBeenCalledWith('0x0');
+    });
 });