mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

more tests fixed

Browse Source
yann300-patch-5
aniket-engg 4 years ago committed by Aniket
parent 58c1cfcdf9
commit 65c1d63df4
5 changed files with 31 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      libs/remix-debug/src/solidity-decoder/decodeInfo.js
  2. 8
      libs/remix-debug/src/solidity-decoder/types/Enum.js
  3. 8
      libs/remix-debug/src/source/sourceMappingDecoder.js
  4. 42
      libs/remix-debug/test/decoder/decodeInfo.js
  5. 2
      libs/remix-debug/test/sourceMappingDecoder.js

2
libs/remix-debug/src/solidity-decoder/decodeInfo.js
Unescape View File

@ -244,7 +244,7 @@ function getStructMembers (type, stateDefinitions, contractName, location) {
if (state) { if (state) {
for (let dec of state.stateDefinitions) { for (let dec of state.stateDefinitions) {
if (dec.nodeType === 'StructDefinition' && type === contractName + '.' + dec.name) { if (dec.nodeType === 'StructDefinition' && type === contractName + '.' + dec.name) {
const offsets = computeOffsets(dec.children, stateDefinitions, contractName, location) const offsets = computeOffsets(dec.members, stateDefinitions, contractName, location)
if (!offsets) { if (!offsets) {
return null return null
} }

8
libs/remix-debug/src/solidity-decoder/types/Enum.js
Unescape View File

@ -4,7 +4,7 @@ const ValueType = require('./ValueType')
class Enum extends ValueType { class Enum extends ValueType {
constructor (enumDef) { constructor (enumDef) {
let storageBytes = 0 let storageBytes = 0
let length = enumDef.children.length let length = enumDef.members.length
while (length > 1) { while (length > 1) {
length = length / 256 length = length / 256
storageBytes++ storageBytes++
@ -15,11 +15,11 @@ class Enum extends ValueType {
decodeValue (value) { decodeValue (value) {
if (!value) { if (!value) {
return this.enumDef.children[0].attributes.name return this.enumDef.members[0].name
} }
value = parseInt(value, 16) value = parseInt(value, 16)
if (this.enumDef.children.length > value) { if (this.enumDef.members.length > value) {
return this.enumDef.children[value].attributes.name return this.enumDef.members[value].name
} }
return 'INVALID_ENUM<' + value + '>' return 'INVALID_ENUM<' + value + '>'
} }

8
libs/remix-debug/src/source/sourceMappingDecoder.js
Unescape View File

@ -152,7 +152,7 @@ function findNodeAtSourceLocation (astNodeType, sourceLocation, ast) {
return true return true
} }
if (nodeLocation.start <= sourceLocation.start && nodeLocation.start + nodeLocation.length >= sourceLocation.start + sourceLocation.length) { if (nodeLocation.start <= sourceLocation.start && nodeLocation.start + nodeLocation.length >= sourceLocation.start + sourceLocation.length) {
if (astNodeType === node.name) { if (astNodeType === node.nodeType) {
found = node found = node
return false return false
} else { } else {
@ -162,7 +162,7 @@ function findNodeAtSourceLocation (astNodeType, sourceLocation, ast) {
return false return false
} }
} }
astWalker.walk(ast.legacyAST, callback) astWalker.walk(ast.ast, callback)
return found return found
} }
@ -176,7 +176,7 @@ function nodesAtPosition (astNodeType, position, ast) {
return return
} }
if (nodeLocation.start <= position && nodeLocation.start + nodeLocation.length >= position) { if (nodeLocation.start <= position && nodeLocation.start + nodeLocation.length >= position) {
if (!astNodeType || astNodeType === node.name) { if (!astNodeType || astNodeType === node.nodeType) {
found.push(node) found.push(node)
if (astNodeType) return false if (astNodeType) return false
} }
@ -185,7 +185,7 @@ function nodesAtPosition (astNodeType, position, ast) {
return false return false
} }
} }
astWalker.walk(ast.legacyAST, callback) astWalker.walk(ast.ast, callback)
return found return found
} }

42
libs/remix-debug/test/decoder/decodeInfo.js
Unescape View File

@ -17,51 +17,51 @@ tape('solidity', function (t) {
var state = astHelper.extractStateDefinitions('test.sol:contractUint', output.sources) var state = astHelper.extractStateDefinitions('test.sol:contractUint', output.sources)
var states = astHelper.extractStatesDefinitions(output.sources) var states = astHelper.extractStatesDefinitions(output.sources)
var stateDef = state.stateDefinitions var stateDef = state.stateDefinitions
var parsedType = decodeInfo.parseType(stateDef[0].attributes.type, states, 'contractUint', util.extractLocationFromAstVariable(stateDef[0])) var parsedType = decodeInfo.parseType(stateDef[0].typeDescriptions.typeString, states, 'contractUint', util.extractLocationFromAstVariable(stateDef[0]))
checkDecodeInfo(st, parsedType, 1, 1, 'uint8') checkDecodeInfo(st, parsedType, 1, 1, 'uint8')
parsedType = decodeInfo.parseType(stateDef[2].attributes.type, states, 'contractUint', util.extractLocationFromAstVariable(stateDef[2])) parsedType = decodeInfo.parseType(stateDef[1].typeDescriptions.typeString, states, 'contractUint', util.extractLocationFromAstVariable(stateDef[1]))
checkDecodeInfo(st, parsedType, 1, 32, 'uint256') checkDecodeInfo(st, parsedType, 1, 32, 'uint256')
parsedType = decodeInfo.parseType(stateDef[3].attributes.type, states, 'contractUint', util.extractLocationFromAstVariable(stateDef[3])) parsedType = decodeInfo.parseType(stateDef[2].typeDescriptions.typeString, states, 'contractUint', util.extractLocationFromAstVariable(stateDef[2]))
checkDecodeInfo(st, parsedType, 1, 32, 'uint256') checkDecodeInfo(st, parsedType, 1, 32, 'uint256')
parsedType = decodeInfo.parseType(stateDef[4].attributes.type, states, 'contractUint', util.extractLocationFromAstVariable(stateDef[4])) parsedType = decodeInfo.parseType(stateDef[3].typeDescriptions.typeString, states, 'contractUint', util.extractLocationFromAstVariable(stateDef[3]))
checkDecodeInfo(st, parsedType, 1, 16, 'bytes16') checkDecodeInfo(st, parsedType, 1, 16, 'bytes16')
state = astHelper.extractStateDefinitions('test.sol:contractStructAndArray', output.sources) state = astHelper.extractStateDefinitions('test.sol:contractStructAndArray', output.sources)
stateDef = state.stateDefinitions stateDef = state.stateDefinitions
parsedType = decodeInfo.parseType(stateDef[1].attributes.type, states, 'contractStructAndArray', util.extractLocationFromAstVariable(stateDef[1])) parsedType = decodeInfo.parseType(stateDef[1].typeDescriptions.typeString, states, 'contractStructAndArray', util.extractLocationFromAstVariable(stateDef[1]))
checkDecodeInfo(st, parsedType, 2, 32, 'struct contractStructAndArray.structDef') checkDecodeInfo(st, parsedType, 2, 32, 'struct contractStructAndArray.structDef')
parsedType = decodeInfo.parseType(stateDef[2].attributes.type, states, 'contractStructAndArray', util.extractLocationFromAstVariable(stateDef[2])) parsedType = decodeInfo.parseType(stateDef[2].typeDescriptions.typeString, states, 'contractStructAndArray', util.extractLocationFromAstVariable(stateDef[2]))
checkDecodeInfo(st, parsedType, 6, 32, 'struct contractStructAndArray.structDef[3]') checkDecodeInfo(st, parsedType, 6, 32, 'struct contractStructAndArray.structDef[3]')
parsedType = decodeInfo.parseType(stateDef[3].attributes.type, states, 'contractStructAndArray', util.extractLocationFromAstVariable(stateDef[3])) parsedType = decodeInfo.parseType(stateDef[3].typeDescriptions.typeString, states, 'contractStructAndArray', util.extractLocationFromAstVariable(stateDef[3]))
checkDecodeInfo(st, parsedType, 2, 32, 'bytes12[4]') checkDecodeInfo(st, parsedType, 2, 32, 'bytes12[4]')
state = astHelper.extractStateDefinitions('test.sol:contractArray', output.sources) state = astHelper.extractStateDefinitions('test.sol:contractArray', output.sources)
stateDef = state.stateDefinitions stateDef = state.stateDefinitions
parsedType = decodeInfo.parseType(stateDef[0].attributes.type, states, 'contractArray', util.extractLocationFromAstVariable(stateDef[0])) parsedType = decodeInfo.parseType(stateDef[0].typeDescriptions.typeString, states, 'contractArray', util.extractLocationFromAstVariable(stateDef[0]))
checkDecodeInfo(st, parsedType, 1, 32, 'uint32[5]') checkDecodeInfo(st, parsedType, 1, 32, 'uint32[5]')
parsedType = decodeInfo.parseType(stateDef[1].attributes.type, states, 'contractArray', util.extractLocationFromAstVariable(stateDef[1])) parsedType = decodeInfo.parseType(stateDef[1].typeDescriptions.typeString, states, 'contractArray', util.extractLocationFromAstVariable(stateDef[1]))
checkDecodeInfo(st, parsedType, 1, 32, 'int8[]') checkDecodeInfo(st, parsedType, 1, 32, 'int8[]')
parsedType = decodeInfo.parseType(stateDef[2].attributes.type, states, 'contractArray', util.extractLocationFromAstVariable(stateDef[2])) parsedType = decodeInfo.parseType(stateDef[2].typeDescriptions.typeString, states, 'contractArray', util.extractLocationFromAstVariable(stateDef[2]))
checkDecodeInfo(st, parsedType, 4, 32, 'int16[][3][][4]') checkDecodeInfo(st, parsedType, 4, 32, 'int16[][3][][4]')
state = astHelper.extractStateDefinitions('test.sol:contractEnum', output.sources) state = astHelper.extractStateDefinitions('test.sol:contractEnum', output.sources)
stateDef = state.stateDefinitions stateDef = state.stateDefinitions
parsedType = decodeInfo.parseType(stateDef[1].attributes.type, states, 'contractEnum') parsedType = decodeInfo.parseType(stateDef[1].typeDescriptions.typeString, states, 'contractEnum')
checkDecodeInfo(st, parsedType, 1, 2, 'enum') checkDecodeInfo(st, parsedType, 1, 2, 'enum')
state = astHelper.extractStateDefinitions('test.sol:contractSmallVariable', output.sources) state = astHelper.extractStateDefinitions('test.sol:contractSmallVariable', output.sources)
stateDef = state.stateDefinitions stateDef = state.stateDefinitions
parsedType = decodeInfo.parseType(stateDef[0].attributes.type, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[0])) parsedType = decodeInfo.parseType(stateDef[0].typeDescriptions.typeString, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[0]))
checkDecodeInfo(st, parsedType, 1, 1, 'int8') checkDecodeInfo(st, parsedType, 1, 1, 'int8')
parsedType = decodeInfo.parseType(stateDef[1].attributes.type, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[1])) parsedType = decodeInfo.parseType(stateDef[1].typeDescriptions.typeString, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[1]))
checkDecodeInfo(st, parsedType, 1, 1, 'uint8') checkDecodeInfo(st, parsedType, 1, 1, 'uint8')
parsedType = decodeInfo.parseType(stateDef[2].attributes.type, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[2])) parsedType = decodeInfo.parseType(stateDef[2].typeDescriptions.typeString, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[2]))
checkDecodeInfo(st, parsedType, 1, 2, 'uint16') checkDecodeInfo(st, parsedType, 1, 2, 'uint16')
parsedType = decodeInfo.parseType(stateDef[3].attributes.type, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[3])) parsedType = decodeInfo.parseType(stateDef[3].typeDescriptions.typeString, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[3]))
checkDecodeInfo(st, parsedType, 1, 4, 'int32') checkDecodeInfo(st, parsedType, 1, 4, 'int32')
parsedType = decodeInfo.parseType(stateDef[4].attributes.type, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[4])) parsedType = decodeInfo.parseType(stateDef[4].typeDescriptions.typeString, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[4]))
checkDecodeInfo(st, parsedType, 1, 32, 'uint256') checkDecodeInfo(st, parsedType, 1, 32, 'uint256')
parsedType = decodeInfo.parseType(stateDef[5].attributes.type, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[5])) parsedType = decodeInfo.parseType(stateDef[5].typeDescriptions.typeString, states, 'contractSmallVariable', util.extractLocationFromAstVariable(stateDef[5]))
checkDecodeInfo(st, parsedType, 1, 2, 'int16') checkDecodeInfo(st, parsedType, 1, 2, 'int16')
output = compiler.compile(compilerInput(simplecontracts)) output = compiler.compile(compilerInput(simplecontracts))
@ -69,16 +69,16 @@ tape('solidity', function (t) {
state = astHelper.extractStateDefinitions('test.sol:simpleContract', output.sources) state = astHelper.extractStateDefinitions('test.sol:simpleContract', output.sources)
states = astHelper.extractStatesDefinitions(output.sources) states = astHelper.extractStatesDefinitions(output.sources)
stateDef = state.stateDefinitions stateDef = state.stateDefinitions
parsedType = decodeInfo.parseType(stateDef[2].attributes.type, states, 'simpleContract', util.extractLocationFromAstVariable(stateDef[2])) parsedType = decodeInfo.parseType(stateDef[2].typeDescriptions.typeString, states, 'simpleContract', util.extractLocationFromAstVariable(stateDef[2]))
checkDecodeInfo(st, parsedType, 2, 32, 'struct simpleContract.structDef') checkDecodeInfo(st, parsedType, 2, 32, 'struct simpleContract.structDef')
parsedType = decodeInfo.parseType(stateDef[3].attributes.type, states, 'simpleContract', util.extractLocationFromAstVariable(stateDef[3])) parsedType = decodeInfo.parseType(stateDef[3].typeDescriptions.typeString, states, 'simpleContract', util.extractLocationFromAstVariable(stateDef[3]))
checkDecodeInfo(st, parsedType, 6, 32, 'struct simpleContract.structDef[3]') checkDecodeInfo(st, parsedType, 6, 32, 'struct simpleContract.structDef[3]')
parsedType = decodeInfo.parseType(stateDef[4].attributes.type, states, 'simpleContract', util.extractLocationFromAstVariable(stateDef[4])) parsedType = decodeInfo.parseType(stateDef[4].typeDescriptions.typeString, states, 'simpleContract', util.extractLocationFromAstVariable(stateDef[4]))
checkDecodeInfo(st, parsedType, 1, 1, 'enum') checkDecodeInfo(st, parsedType, 1, 1, 'enum')
state = astHelper.extractStateDefinitions('test.sol:test2', output.sources) state = astHelper.extractStateDefinitions('test.sol:test2', output.sources)
stateDef = state.stateDefinitions stateDef = state.stateDefinitions
parsedType = decodeInfo.parseType(stateDef[0].attributes.type, states, 'test1', util.extractLocationFromAstVariable(stateDef[0])) parsedType = decodeInfo.parseType(stateDef[0].typeDescriptions.typeString, states, 'test1', util.extractLocationFromAstVariable(stateDef[0]))
checkDecodeInfo(st, parsedType, 1, 32, 'struct test1.str') checkDecodeInfo(st, parsedType, 1, 32, 'struct test1.str')
state = stateDecoder.extractStateVariables('test.sol:test2', output.sources) state = stateDecoder.extractStateVariables('test.sol:test2', output.sources)

2
libs/remix-debug/test/sourceMappingDecoder.js
Unescape View File

@ -15,7 +15,7 @@ tape('SourceMappingDecoder', function (t) {
node = sourceMappingDecoder.findNodeAtInstructionIndex('FunctionDefinition', 80, output.contracts['test.sol']['test'].evm.deployedBytecode.sourceMap, output.sources['test.sol']) node = sourceMappingDecoder.findNodeAtInstructionIndex('FunctionDefinition', 80, output.contracts['test.sol']['test'].evm.deployedBytecode.sourceMap, output.sources['test.sol'])
st.notEqual(node, null) st.notEqual(node, null)
if (node) { if (node) {
st.equal(node.attributes.name, 'f1') st.equal(node.name, 'f1')
} }
st.end() st.end()
}) })

Write Preview
Loading…
Cancel
Save