cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added some checks on parameters of the objects imported from the json files to make debugging easier.

Browse Source
This commit is contained in:
Carl Allendorph 2014-04-19 22:09:41 -07:00
parent b8da12f2b8
commit cd2168ddda
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vm.cpp
View File

@ -136,6 +136,12 @@ public:
void importEnv(mObject& _o) void importEnv(mObject& _o)
{ {
BOOST_REQUIRE(_o.count("previousHash") > 0 );
BOOST_REQUIRE(_o.count("previousNonce") > 0 );
BOOST_REQUIRE(_o.count("currentDifficulty") > 0 );
BOOST_REQUIRE(_o.count("currentTimestamp") > 0 );
BOOST_REQUIRE(_o.count("currentCoinbase") > 0 );
previousBlock.hash = h256(_o["previousHash"].get_str()); previousBlock.hash = h256(_o["previousHash"].get_str());
previousBlock.nonce = h256(_o["previousNonce"].get_str()); previousBlock.nonce = h256(_o["previousNonce"].get_str());
currentBlock.difficulty = toInt(_o["currentDifficulty"]); currentBlock.difficulty = toInt(_o["currentDifficulty"]);
@ -229,6 +235,10 @@ public:
for (auto const& i: _o) for (auto const& i: _o)
{ {
mObject o = i.second.get_obj(); mObject o = i.second.get_obj();
BOOST_REQUIRE(o.count("balance") > 0 );
BOOST_REQUIRE(o.count("nonce") > 0 );
BOOST_REQUIRE(o.count("store") > 0 );
auto& a = addresses[Address(i.first)]; auto& a = addresses[Address(i.first)];
get<0>(a) = toInt(o["balance"]); get<0>(a) = toInt(o["balance"]);
get<1>(a) = toInt(o["nonce"]); get<1>(a) = toInt(o["nonce"]);
@ -250,6 +260,7 @@ public:
mObject exportExec() mObject exportExec()
{ {
mObject ret; mObject ret;
ret["address"] = toString(myAddress); ret["address"] = toString(myAddress);
ret["caller"] = toString(caller); ret["caller"] = toString(caller);
@ -265,6 +276,13 @@ public:
void importExec(mObject& _o) void importExec(mObject& _o)
{ {
BOOST_REQUIRE(_o.count("address")> 0);
BOOST_REQUIRE(_o.count("caller") > 0);
BOOST_REQUIRE(_o.count("origin") > 0);
BOOST_REQUIRE(_o.count("value") > 0);
BOOST_REQUIRE(_o.count("gasPrice") > 0);
BOOST_REQUIRE(_o.count("data") > 0 );
myAddress = Address(_o["address"].get_str()); myAddress = Address(_o["address"].get_str());
caller = Address(_o["caller"].get_str()); caller = Address(_o["caller"].get_str());
origin = Address(_o["origin"].get_str()); origin = Address(_o["origin"].get_str());
@ -298,6 +316,9 @@ public:
for (mValue& v: _txs) for (mValue& v: _txs)
{ {
auto tx = v.get_obj(); auto tx = v.get_obj();
BOOST_REQUIRE(tx.count("destination") > 0);
BOOST_REQUIRE(tx.count("value") > 0 );
BOOST_REQUIRE(tx.count("data") > 0 );
Transaction t; Transaction t;
t.receiveAddress = Address(tx["destination"].get_str()); t.receiveAddress = Address(tx["destination"].get_str());
t.value = toInt(tx["value"]); t.value = toInt(tx["value"]);
@ -320,6 +341,10 @@ public:
cnote << i.first; cnote << i.first;
mObject& o = i.second.get_obj(); mObject& o = i.second.get_obj();
BOOST_REQUIRE( o.count("env") > 0 );
BOOST_REQUIRE( o.count("pre") > 0 );
BOOST_REQUIRE( o.count("exec") > 0 );
VM vm; VM vm;
eth::test::FakeExtVM fev; eth::test::FakeExtVM fev;
fev.importEnv(o["env"].get_obj()); fev.importEnv(o["env"].get_obj());
@ -345,6 +370,10 @@ public:
} }
else else
{ {
BOOST_REQUIRE( o.count("post") > 0 );
BOOST_REQUIRE( o.count("txs") > 0 );
BOOST_REQUIRE( o.count("out") > 0 );
eth::test::FakeExtVM test; eth::test::FakeExtVM test;
test.importState(o["post"].get_obj()); test.importState(o["post"].get_obj());
test.importTxs(o["txs"].get_array()); test.importTxs(o["txs"].get_array());