state test conditions to filler files

This commit is contained in:
winsvega 2015-01-31 21:00:35 +03:00
parent 7b51526a2c
commit f7f26d0fbd

View File

@ -108,6 +108,12 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
BOOST_REQUIRE(o.count("storage") > 0); BOOST_REQUIRE(o.count("storage") > 0);
BOOST_REQUIRE(o.count("code") > 0); BOOST_REQUIRE(o.count("code") > 0);
bigint biValue256 = bigint("115792089237316195423570985008687907853269984665640564039457584007913129639936");
if (bigint(o["balance"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("State 'balance' is equal or grater than 2**256") );
if (bigint(o["nonce"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("State 'nonce' is equal or grater than 2**256") );
Address address = Address(i.first); Address address = Address(i.first);
bytes code = importCode(o); bytes code = importCode(o);
@ -140,6 +146,16 @@ void ImportTest::importTransaction(json_spirit::mObject& _o)
BOOST_REQUIRE(_o.count("secretKey") > 0); BOOST_REQUIRE(_o.count("secretKey") > 0);
BOOST_REQUIRE(_o.count("data") > 0); BOOST_REQUIRE(_o.count("data") > 0);
bigint biValue256 = bigint("115792089237316195423570985008687907853269984665640564039457584007913129639936");
if (bigint(_o["nonce"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Transaction 'nonce' is equal or grater than 2**256") );
if (bigint(_o["gasPrice"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Transaction 'gasPrice' is equal or grater than 2**256") );
if (bigint(_o["gasLimit"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Transaction 'gasLimit' is equal or grater than 2**256") );
if (bigint(_o["value"].get_str()) >= biValue256)
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Transaction 'value' is equal or grater than 2**256") );
m_transaction = _o["to"].get_str().empty() ? m_transaction = _o["to"].get_str().empty() ?
Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str())) : Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str())) :
Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), Address(_o["to"].get_str()), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str())); Transaction(toInt(_o["value"]), toInt(_o["gasPrice"]), toInt(_o["gasLimit"]), Address(_o["to"].get_str()), importData(_o), toInt(_o["nonce"]), Secret(_o["secretKey"].get_str()));