remove double check of accountMask upon loading chain config

ethereum · Jun 14, 2018 · 5549af4 · 5549af4
1 parent 2dd0bf0
commit 5549af4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/libethereum/Account.cpp b/libethereum/Account.cpp
@@ -85,6 +85,7 @@ PrecompiledContract createPrecompiledContract(js::mObject const& _precompiled)
 }
 }
 
+// TODO move AccountMaskObj to libtesteth (it is used only in test logic)
 AccountMap dev::eth::jsonToAccountMap(std::string const& _json, u256 const& _defaultNonce,
     AccountMaskMap* o_mask, PrecompiledContractMap* o_precompiled, const fs::path& _configPath)
 {
@@ -105,7 +106,6 @@ AccountMap dev::eth::jsonToAccountMap(std::string const& _json, u256 const& _def
     {
         Address a(fromHex(account.first));
         auto const& accountMaskJson = account.second.get_obj();
-        validateAccountMaskObj(accountMaskJson);
 
         bool haveBalance = (accountMaskJson.count(c_wei) || accountMaskJson.count(c_finney) ||
                             accountMaskJson.count(c_balance));

diff --git a/libethereum/ValidationSchemes.h b/libethereum/ValidationSchemes.h
@@ -74,6 +74,7 @@ void validateConfigJson(json_spirit::mObject const& _obj);
 // Validate account json object
 void validateAccountObj(json_spirit::mObject const& _o);
 
+// TODO move AccountMaskObj to libtesteth (it is used only in test logic)
 // Validate accountMask json object. Mask indicates which fields are set
 void validateAccountMaskObj(json_spirit::mObject const& _o);
 }

diff --git a/test/tools/libtesteth/BlockChainHelper.cpp b/test/tools/libtesteth/BlockChainHelper.cpp
@@ -25,6 +25,7 @@
 #include <libethereum/BlockChain.h>
 #include <libethereum/GenesisInfo.h>
 #include <libethereum/TransactionQueue.h>
+#include <libethereum/ValidationSchemes.h>
 #include <test/tools/libtesteth/BlockChainHelper.h>
 #include <test/tools/libtesteth/TestHelper.h>
 using namespace std;
@@ -106,6 +107,12 @@ void TestBlock::initBlockFromJsonHeader(mObject const& _blockHeader, mObject con
 
     json_spirit::mObject state = _stateObj;
     dev::test::replaceCodeInState(state);
+
+    for (auto const& account : state)
+    {
+        auto const& accountJson = account.second.get_obj();
+        validation::validateAccountObj(accountJson);
+    }
     m_accountMap = jsonToAccountMap(json_spirit::write_string(json_spirit::mValue(state), false));
 
     m_blockHeader =

diff --git a/test/tools/libtesteth/ImportTest.cpp b/test/tools/libtesteth/ImportTest.cpp
@@ -18,14 +18,15 @@
  * Helper class for managing data when running state tests
  */
 
-#include <test/tools/libtesteth/TestHelper.h>
-#include <test/tools/libtesteth/ImportTest.h>
-#include <test/tools/libtesteth/TestOutputHelper.h>
+#include <libethereum/ValidationSchemes.h>
+#include <test/tools/jsontests/BlockChainTests.h>
 #include <test/tools/libtesteth/BlockChainHelper.h>
+#include <test/tools/libtesteth/ImportTest.h>
 #include <test/tools/libtesteth/Options.h>
+#include <test/tools/libtesteth/TestHelper.h>
+#include <test/tools/libtesteth/TestOutputHelper.h>
 #include <test/tools/libtestutils/Common.h>
 #include <test/tools/libtestutils/TestLastBlockHashes.h>
-#include <test/tools/jsontests/BlockChainTests.h>
 
 #include <boost/filesystem/path.hpp>
 
@@ -384,6 +385,11 @@ void ImportTest::importState(json_spirit::mObject const& _o, State& _state, Acco
     json_spirit::mObject o = _o;
     replaceCodeInState(
         o);  // Compile LLL and other src code of the test Fillers using external call to lllc
+    for (auto const& account : o)
+    {
+        auto const& accountMaskJson = account.second.get_obj();
+        validation::validateAccountMaskObj(accountMaskJson);
+    }
     std::string jsondata = json_spirit::write_string((json_spirit::mValue)o, false);
     _state.populateFrom(jsonToAccountMap(jsondata, 0, &o_mask));
 }