status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix JSON VMtests compile-time errors (#25) 

* Fix imports

* Fix Ethtime in fixtures following https://github.com/nim-lang/Nim/commit/f6df2d9956a79eda0486391
This commit is contained in:
Mamy Ratsimbazafy 2018-05-11 15:32:10 +02:00 committed by GitHub
parent 2d34f1453c
commit 8f95c86944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_vm_json.nim
View File

@ -6,10 +6,13 @@
# at your option. This file may not be copied, modified, or distributed except according to those terms. # at your option. This file may not be copied, modified, or distributed except according to those terms.
import import
unittest, strformat, strutils, sequtils, tables, stint, json, unittest, strformat, strutils, sequtils, tables, stint, json, ospaths, times,
test_helpers, constants, errors, logging, ospaths, ./test_helpers,
chain, vm_state, computation, opcode, types, opcode_table, utils / [header, padding], vm / [gas_meter, message, code_stream, stack], vm / forks / frontier / vm, db / [db_chain, state_db], db / backends / memory_backend ../src/[constants, errors, logging],
../src/[chain, vm_state, computation, opcode, types, opcode_table],
../src/utils/[header, padding],
../src/vm/[gas_meter, message, code_stream, stack],
../src/vm/forks/frontier/vm, ../src/db/[db_chain, state_db, backends/memory_backend]
proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus) proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus)
@ -26,8 +29,8 @@ proc testFixture(fixtures: JsonNode, testStatusIMPL: var TestStatus) =
coinbase: fixture{"env"}{"currentCoinbase"}.getStr, coinbase: fixture{"env"}{"currentCoinbase"}.getStr,
difficulty: fixture{"env"}{"currentDifficulty"}.getHexadecimalInt.u256, difficulty: fixture{"env"}{"currentDifficulty"}.getHexadecimalInt.u256,
blockNumber: fixture{"env"}{"currentNumber"}.getHexadecimalInt.u256, blockNumber: fixture{"env"}{"currentNumber"}.getHexadecimalInt.u256,
gasLimit: fixture{"env"}{"currentGasLimit"}.getHexadecimalInt.u256, # gasLimit: fixture{"env"}{"currentGasLimit"}.getHexadecimalInt.u256,
timestamp: fixture{"env"}{"currentTimestamp"}.getHexadecimalInt) timestamp: fixture{"env"}{"currentTimestamp"}.getHexadecimalInt.int64.fromUnix)
var code = "" var code = ""
vm.state.db(readOnly=false): vm.state.db(readOnly=false):