Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Parameters amount in EcRecoverMethod fixed #2567

Merged
merged 4 commits into from
Mar 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion jest.preprocessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ module.exports = require('babel-jest').createTransformer({
'@babel/plugin-transform-runtime',
['istanbul', {
'exclude': [
'dist'
'dist',
'tests',
'node_modules'
]
}]
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
* @date 2018
*/

import isFunction from 'lodash/isFunction'
import AbstractMethod from '../../../lib/methods/AbstractMethod';

export default class PersonalSignMethod extends AbstractMethod {
Expand All @@ -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];
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
});