diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-04-06 04:43:20 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-04-06 04:43:20 +0800 |
| commit | 11220625bdc8319c8275e2782eaa6887eee4fe22 (patch) | |
| tree | e7ace5b954e412ca43024f17a60fb139bea18f66 /TestHelper.cpp | |
| parent | a8c8d5ece587906f355b2ea28f0f6ce1bf9e10dd (diff) | |
| parent | a2507495052d39ef4ddfc6fc256b29e063a81eb6 (diff) | |
| download | dexon-solidity-11220625bdc8319c8275e2782eaa6887eee4fe22.tar dexon-solidity-11220625bdc8319c8275e2782eaa6887eee4fe22.tar.gz dexon-solidity-11220625bdc8319c8275e2782eaa6887eee4fe22.tar.bz2 dexon-solidity-11220625bdc8319c8275e2782eaa6887eee4fe22.tar.lz dexon-solidity-11220625bdc8319c8275e2782eaa6887eee4fe22.tar.xz dexon-solidity-11220625bdc8319c8275e2782eaa6887eee4fe22.tar.zst dexon-solidity-11220625bdc8319c8275e2782eaa6887eee4fe22.zip | |
Merge branch 'develop' into p2p
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 295b759f..dd7c09ea 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -70,7 +70,10 @@ namespace test struct ValueTooLarge: virtual Exception {}; bigint const c_max256plus1 = bigint(1) << 256; -ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller) : m_statePre(Address(_o["env"].get_obj()["currentCoinbase"].get_str()), OverlayDB(), eth::BaseState::Empty), m_statePost(Address(_o["env"].get_obj()["currentCoinbase"].get_str()), OverlayDB(), eth::BaseState::Empty), m_TestObject(_o) +ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller): + m_statePre(OverlayDB(), eth::BaseState::Empty, Address(_o["env"].get_obj()["currentCoinbase"].get_str())), + m_statePost(OverlayDB(), eth::BaseState::Empty, Address(_o["env"].get_obj()["currentCoinbase"].get_str())), + m_TestObject(_o) { importEnv(_o["env"].get_obj()); importState(_o["pre"].get_obj(), m_statePre); @@ -92,7 +95,7 @@ void ImportTest::importEnv(json_spirit::mObject& _o) assert(_o.count("currentCoinbase") > 0); assert(_o.count("currentNumber") > 0); - m_environment.previousBlock.hash = h256(_o["previousHash"].get_str()); + m_environment.currentBlock.parentHash = h256(_o["previousHash"].get_str()); m_environment.currentBlock.number = toInt(_o["currentNumber"]); m_environment.currentBlock.gasLimit = toInt(_o["currentGasLimit"]); m_environment.currentBlock.difficulty = toInt(_o["currentDifficulty"]); |