diff --git a/libdevcore/Exceptions.h b/libdevcore/Exceptions.h index 961fc6f4c..e13d41476 100644 --- a/libdevcore/Exceptions.h +++ b/libdevcore/Exceptions.h @@ -33,7 +33,6 @@ namespace dev // base class for all exceptions struct Exception: virtual std::exception, virtual boost::exception { mutable std::string m_message; }; -struct ValueTooLarge: virtual Exception {}; struct BadHexCharacter: virtual Exception {}; struct RLPException: virtual Exception {}; struct BadCast: virtual RLPException {}; diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp index ed351bb73..8e4c493eb 100644 --- a/test/TestHelper.cpp +++ b/test/TestHelper.cpp @@ -108,10 +108,9 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state) BOOST_REQUIRE(o.count("storage") > 0); BOOST_REQUIRE(o.count("code") > 0); - bigint biValue256 = bigint(1) << 256; - if (bigint(o["balance"].get_str()) >= biValue256) + if (bigint(o["balance"].get_str()) >= c_max256plus1) BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("State 'balance' is equal or greater than 2**256") ); - if (bigint(o["nonce"].get_str()) >= biValue256) + if (bigint(o["nonce"].get_str()) >= c_max256plus1) BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("State 'nonce' is equal or greater than 2**256") ); Address address = Address(i.first); @@ -146,14 +145,13 @@ void ImportTest::importTransaction(json_spirit::mObject& _o) BOOST_REQUIRE(_o.count("secretKey") > 0); BOOST_REQUIRE(_o.count("data") > 0); - bigint biValue256 = bigint(1) << 256; - if (bigint(_o["nonce"].get_str()) >= biValue256) + if (bigint(_o["nonce"].get_str()) >= c_max256plus1) BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'nonce' is equal or greater than 2**256") ); - if (bigint(_o["gasPrice"].get_str()) >= biValue256) + if (bigint(_o["gasPrice"].get_str()) >= c_max256plus1) BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'gasPrice' is equal or greater than 2**256") ); - if (bigint(_o["gasLimit"].get_str()) >= biValue256) + if (bigint(_o["gasLimit"].get_str()) >= c_max256plus1) BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'gasLimit' is equal or greater than 2**256") ); - if (bigint(_o["value"].get_str()) >= biValue256) + if (bigint(_o["value"].get_str()) >= c_max256plus1) BOOST_THROW_EXCEPTION(ValueTooLarge() << errinfo_comment("Transaction 'value' is equal or greater than 2**256") ); m_transaction = _o["to"].get_str().empty() ? diff --git a/test/TestHelper.h b/test/TestHelper.h index ae6ea20cc..2b93bccfb 100644 --- a/test/TestHelper.h +++ b/test/TestHelper.h @@ -42,6 +42,9 @@ void connectClients(Client& c1, Client& c2); namespace test { +struct ValueTooLarge: virtual Exception {}; +bigint const c_max256plus1 = bigint(1) << 256; + class ImportTest { public: