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

only check rootHash of state if FATDB is off

Browse Source
This commit is contained in:
CJentzsch 2015-03-02 20:45:42 +01:00 committed by Gav Wood
parent 25cd3855c6
commit 8628b65164
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
state.cpp
View File

@ -72,7 +72,13 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
} }
if (_fillin) if (_fillin)
{
#if ETH_FATDB
importer.exportTest(output, theState); importer.exportTest(output, theState);
#else
BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("You can not fill tests when FATDB is switched off"));
#endif
}
else else
{ {
BOOST_REQUIRE(o.count("post") > 0); BOOST_REQUIRE(o.count("post") > 0);
@ -85,6 +91,8 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
checkLog(theState.pending().size() ? theState.log(0) : LogEntries(), importer.m_environment.sub.logs); checkLog(theState.pending().size() ? theState.log(0) : LogEntries(), importer.m_environment.sub.logs);
// check addresses // check addresses
#if ETH_FATDB
cout << "fatDB is defined\n";
auto expectedAddrs = importer.m_statePost.addresses(); auto expectedAddrs = importer.m_statePost.addresses();
auto resultAddrs = theState.addresses(); auto resultAddrs = theState.addresses();
for (auto& expectedPair : expectedAddrs) for (auto& expectedPair : expectedAddrs)
@ -103,6 +111,8 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
} }
} }
checkAddresses<map<Address, u256> >(expectedAddrs, resultAddrs); checkAddresses<map<Address, u256> >(expectedAddrs, resultAddrs);
#endif
BOOST_CHECK_MESSAGE(theState.rootHash() == h256(o["postStateRoot"].get_str()), "wrong post state root");
} }
} }
} }