diff options
| author | Gav Wood <i@gavwood.com> | 2015-03-15 02:59:17 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2015-03-15 02:59:17 +0800 |
| commit | 65f2df15df85203993674a7c961599c525d7e36f (patch) | |
| tree | cc89f196e8345d63c2414d9bc3ca2fcb266092c5 /TestHelper.cpp | |
| parent | 1b09e5debba1e04627474ba8ec3b2b7d5bcd1fd6 (diff) | |
| parent | f15e1ef250dc9c2c32a2857d36920369ac5e62ce (diff) | |
| download | dexon-solidity-65f2df15df85203993674a7c961599c525d7e36f.tar dexon-solidity-65f2df15df85203993674a7c961599c525d7e36f.tar.gz dexon-solidity-65f2df15df85203993674a7c961599c525d7e36f.tar.bz2 dexon-solidity-65f2df15df85203993674a7c961599c525d7e36f.tar.lz dexon-solidity-65f2df15df85203993674a7c961599c525d7e36f.tar.xz dexon-solidity-65f2df15df85203993674a7c961599c525d7e36f.tar.zst dexon-solidity-65f2df15df85203993674a7c961599c525d7e36f.zip | |
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index a2e1eaf1..ddc929e4 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -84,12 +84,12 @@ ImportTest::ImportTest(json_spirit::mObject& _o, bool isFiller) : m_statePre(Add void ImportTest::importEnv(json_spirit::mObject& _o) { - BOOST_REQUIRE(_o.count("previousHash") > 0); - BOOST_REQUIRE(_o.count("currentGasLimit") > 0); - BOOST_REQUIRE(_o.count("currentDifficulty") > 0); - BOOST_REQUIRE(_o.count("currentTimestamp") > 0); - BOOST_REQUIRE(_o.count("currentCoinbase") > 0); - BOOST_REQUIRE(_o.count("currentNumber") > 0); + assert(_o.count("previousHash") > 0); + assert(_o.count("currentGasLimit") > 0); + assert(_o.count("currentDifficulty") > 0); + assert(_o.count("currentTimestamp") > 0); + assert(_o.count("currentCoinbase") > 0); + assert(_o.count("currentNumber") > 0); m_environment.previousBlock.hash = h256(_o["previousHash"].get_str()); m_environment.currentBlock.number = toInt(_o["currentNumber"]); @@ -108,10 +108,10 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state) { json_spirit::mObject o = i.second.get_obj(); - BOOST_REQUIRE(o.count("balance") > 0); - BOOST_REQUIRE(o.count("nonce") > 0); - BOOST_REQUIRE(o.count("storage") > 0); - BOOST_REQUIRE(o.count("code") > 0); + assert(o.count("balance") > 0); + assert(o.count("nonce") > 0); + assert(o.count("storage") > 0); + assert(o.count("code") > 0); if (bigint(o["balance"].get_str()) >= c_max256plus1) BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("State 'balance' is equal or greater than 2**256") ); @@ -144,12 +144,12 @@ void ImportTest::importTransaction(json_spirit::mObject& _o) { if (_o.count("secretKey") > 0) { - BOOST_REQUIRE(_o.count("nonce") > 0); - BOOST_REQUIRE(_o.count("gasPrice") > 0); - BOOST_REQUIRE(_o.count("gasLimit") > 0); - BOOST_REQUIRE(_o.count("to") > 0); - BOOST_REQUIRE(_o.count("value") > 0); - BOOST_REQUIRE(_o.count("data") > 0); + assert(_o.count("nonce") > 0); + assert(_o.count("gasPrice") > 0); + assert(_o.count("gasLimit") > 0); + assert(_o.count("to") > 0); + assert(_o.count("value") > 0); + assert(_o.count("data") > 0); if (bigint(_o["nonce"].get_str()) >= c_max256plus1) BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'nonce' is equal or greater than 2**256") ); |