grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

empty data is allowed

Browse Source
This commit is contained in:
jacogr 2016-10-22 10:38:34 +02:00
parent c312f4fb92
commit 8a60ed1315
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/api/util/decode.js
View File

@ -42,14 +42,14 @@ export function decodeCallData (data) {
export function decodeMethodInput (methodAbi, paramdata) { export function decodeMethodInput (methodAbi, paramdata) {
if (!methodAbi) { if (!methodAbi) {
throw new Error('decodeMethodInput should receive valid method-specific ABI'); throw new Error('decodeMethodInput should receive valid method-specific ABI');
} else if (!paramdata) { } else if (paramdata && paramdata.length) {
throw new Error('decodeMethodInput should receive valid parameter input data'); if (!isHex(paramdata)) {
} else if (!isHex(paramdata)) { throw new Error('Input to decodeMethodInput should be a hex value');
throw new Error('Input to decodeMethodInput should be a hex value'); } else if (paramdata.substr(0, 2) === '0x') {
} else if (paramdata.substr(0, 2) === '0x') { return decodeMethodInput(methodAbi, paramdata.slice(2));
return decodeMethodInput(methodAbi, paramdata.slice(2)); } else if (paramdata.length % 64 !== 0) {
} else if (paramdata.length % 64 !== 0) { throw new Error('Parameter length in decodeMethodInput not a multiple of 64 characters');
throw new Error('Parameter length in decodeMethodInput not a multiple of 64 characters'); }
} }
return new Func(methodAbi).decodeInput(paramdata).map((decoded) => decoded.value); return new Func(methodAbi).decodeInput(paramdata).map((decoded) => decoded.value);

4
js/src/api/util/decode.spec.js
View File

@ -44,10 +44,6 @@ describe('api/util/decode', () => {
expect(() => decodeMethodInput(null, null)).to.throw(/should receive valid method/); expect(() => decodeMethodInput(null, null)).to.throw(/should receive valid method/);
}); });
it('expects valid parameter data', () => {
expect(() => decodeMethodInput({}, null)).to.throw(/should receive valid parameter/);
});
it('expect valid hex parameter data', () => { it('expect valid hex parameter data', () => {
expect(() => decodeMethodInput({}, 'invalid')).to.throw(/should be a hex value/); expect(() => decodeMethodInput({}, 'invalid')).to.throw(/should be a hex value/);
}); });