From 0e76ee5d32edcae3092471db9b26a64bdee6e30b Mon Sep 17 00:00:00 2001 From: yann300 Date: Thu, 19 Jan 2017 11:21:57 +0100 Subject: [PATCH] fix tests --- test/solidity/decodeInfo.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/solidity/decodeInfo.js b/test/solidity/decodeInfo.js index 518dc01604..b96b147116 100644 --- a/test/solidity/decodeInfo.js +++ b/test/solidity/decodeInfo.js @@ -19,25 +19,25 @@ tape('solidity', function (t) { decodeInfo = index.solidity.decodeInfo.parseType(stateDef[3].attributes.type, states, 'contractUint') checkDecodeInfo(st, decodeInfo, 1, 32, 'uint') decodeInfo = index.solidity.decodeInfo.parseType(stateDef[4].attributes.type, states, 'contractUint') - checkDecodeInfo(st, decodeInfo, 1, 16, 'bytesX') + checkDecodeInfo(st, decodeInfo, 1, 16, 'bytes16') state = index.solidity.astHelper.extractStateDefinitions('contractStructAndArray', output.sources) stateDef = state.stateDefinitions decodeInfo = index.solidity.decodeInfo.parseType(stateDef[1].attributes.type, states, 'contractStructAndArray') - checkDecodeInfo(st, decodeInfo, 2, 32, 'struct') + checkDecodeInfo(st, decodeInfo, 2, 32, 'struct contractStructAndArray.structDef') decodeInfo = index.solidity.decodeInfo.parseType(stateDef[2].attributes.type, states, 'contractStructAndArray') - checkDecodeInfo(st, decodeInfo, 6, 32, 'array') + checkDecodeInfo(st, decodeInfo, 6, 32, 'struct contractStructAndArray.structDef[3]') decodeInfo = index.solidity.decodeInfo.parseType(stateDef[3].attributes.type, states, 'contractStructAndArray') - checkDecodeInfo(st, decodeInfo, 2, 32, 'array') + checkDecodeInfo(st, decodeInfo, 2, 32, 'bytes12[4]') state = index.solidity.astHelper.extractStateDefinitions('contractArray', output.sources) stateDef = state.stateDefinitions decodeInfo = index.solidity.decodeInfo.parseType(stateDef[0].attributes.type, states, 'contractArray') - checkDecodeInfo(st, decodeInfo, 1, 32, 'array') + checkDecodeInfo(st, decodeInfo, 1, 32, 'uint[5]') decodeInfo = index.solidity.decodeInfo.parseType(stateDef[1].attributes.type, states, 'contractArray') - checkDecodeInfo(st, decodeInfo, 1, 32, 'array') + checkDecodeInfo(st, decodeInfo, 1, 32, 'int[dynamic]') decodeInfo = index.solidity.decodeInfo.parseType(stateDef[2].attributes.type, states, 'contractArray') - checkDecodeInfo(st, decodeInfo, 4, 32, 'array') + checkDecodeInfo(st, decodeInfo, 4, 32, 'int[dynamic][3][dynamic][4]') state = index.solidity.astHelper.extractStateDefinitions('contractEnum', output.sources) stateDef = state.stateDefinitions @@ -65,19 +65,19 @@ tape('solidity', function (t) { states = index.solidity.astHelper.extractStatesDefinitions(output.sources) stateDef = state.stateDefinitions decodeInfo = index.solidity.decodeInfo.parseType(stateDef[2].attributes.type, states, 'simpleContract') - checkDecodeInfo(st, decodeInfo, 2, 32, 'struct') + checkDecodeInfo(st, decodeInfo, 2, 32, 'struct simpleContract.structDef') decodeInfo = index.solidity.decodeInfo.parseType(stateDef[3].attributes.type, states, 'simpleContract') - checkDecodeInfo(st, decodeInfo, 6, 32, 'array') + checkDecodeInfo(st, decodeInfo, 6, 32, 'struct simpleContract.structDef[3]') decodeInfo = index.solidity.decodeInfo.parseType(stateDef[4].attributes.type, states, 'simpleContract') checkDecodeInfo(st, decodeInfo, 1, 1, 'enum') state = index.solidity.astHelper.extractStateDefinitions('test2', output.sources) stateDef = state.stateDefinitions decodeInfo = index.solidity.decodeInfo.parseType(stateDef[0].attributes.type, states, 'test1') - checkDecodeInfo(st, decodeInfo, 0, 32, 'struct') + checkDecodeInfo(st, decodeInfo, 0, 32, 'struct test1.str') state = index.solidity.stateDecoder.extractStateVariables('test2', output.sources) - checkDecodeInfo(st, decodeInfo, 0, 32, 'struct') + checkDecodeInfo(st, decodeInfo, 0, 32, 'struct test1.str') st.end() })