From e043f63819953dd00a3ed9d403d7d5d29fa8b148 Mon Sep 17 00:00:00 2001 From: CJentzsch Date: Mon, 2 Mar 2015 20:45:42 +0100 Subject: only check rootHash of state if FATDB is off --- state.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/state.cpp b/state.cpp index 1581e405..37ffa7f8 100644 --- a/state.cpp +++ b/state.cpp @@ -71,7 +71,13 @@ void doStateTests(json_spirit::mValue& v, bool _fillin) } if (_fillin) + { +#if ETH_FATDB importer.exportTest(output, theState); +#else + BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("You can not fill tests when FATDB is switched off")); +#endif + } else { BOOST_REQUIRE(o.count("post") > 0); @@ -84,6 +90,8 @@ void doStateTests(json_spirit::mValue& v, bool _fillin) checkLog(theState.pending().size() ? theState.log(0) : LogEntries(), importer.m_environment.sub.logs); // check addresses +#if ETH_FATDB + cout << "fatDB is defined\n"; auto expectedAddrs = importer.m_statePost.addresses(); auto resultAddrs = theState.addresses(); for (auto& expectedPair : expectedAddrs) @@ -102,6 +110,8 @@ void doStateTests(json_spirit::mValue& v, bool _fillin) } } checkAddresses >(expectedAddrs, resultAddrs); +#endif + BOOST_CHECK_MESSAGE(theState.rootHash() == h256(o["postStateRoot"].get_str()), "wrong post state root"); } } } -- cgit