fix --filltests for blockchain

Author: Dimitry

test/tools/jsontests/BlockChainTests.cpp

@@ -70,13 +70,15 @@ json_spirit::mValue BlockchainTestSuite::doTests(json_spirit::mValue const& _inp
 		if (_fillin)
 		{
             BOOST_REQUIRE(inputTest.count("expect") > 0);
-            set<eth::Network> allnetworks =
-                ImportTest::getAllNetworksFromExpectSections(inputTest.at("expect").get_array());
+            set<eth::Network> allnetworks = ImportTest::getAllNetworksFromExpectSections(
+                inputTest.at("expect").get_array(), ImportTest::testType::BlockchainTest);
 
             //create a blockchain test for each network
             for (auto& network : allnetworks)
             {
-				if (!Options::get().singleTestNet.empty() && Options::get().singleTestNet != test::netIdToString(network))
+                if (test::isDisabledNetwork(network))
+                    continue;
+                if (!Options::get().singleTestNet.empty() && Options::get().singleTestNet != test::netIdToString(network))
 					continue;
 
 				dev::test::TestBlockChain::s_sealEngineNetwork = network;

test/tools/libtesteth/ImportTest.cpp

@@ -164,14 +164,19 @@ void ImportTest::makeBlockchainTestFromStateTest(set<eth::Network> const& _netwo
 }
 
 /// returns all networks that are defined in all expect sections
-set<eth::Network> ImportTest::getAllNetworksFromExpectSections(json_spirit::mArray const& _expects)
+set<eth::Network> ImportTest::getAllNetworksFromExpectSections(
+    json_spirit::mArray const& _expects, testType _testType)
 {
     set<string> allNetworks;
     for (auto const& exp : _expects)
     {
-        requireJsonFields(exp.get_obj(), "expect",
-            {{"indexes", jsonVType::obj_type}, {"network", jsonVType::array_type},
-                {"result", jsonVType::obj_type}});
+        if (_testType == testType::BlockchainTest)
+            requireJsonFields(exp.get_obj(), "expect",
+                {{"network", jsonVType::str_type}, {"result", jsonVType::obj_type}});
+        else if (_testType == testType::StateTest)
+            requireJsonFields(exp.get_obj(), "expect",
+                {{"indexes", jsonVType::obj_type}, {"network", jsonVType::array_type},
+                    {"result", jsonVType::obj_type}});
         ImportTest::parseJsonStrValueIntoSet(exp.get_obj().at("network"), allNetworks);
     }
 
@@ -192,7 +197,8 @@ bytes ImportTest::executeTest(bool _isFilling)
     {
         // Run tests only on networks from expect sections
         BOOST_REQUIRE(m_testInputObject.count("expect") > 0);
-        networks = getAllNetworksFromExpectSections(m_testInputObject.at("expect").get_array());
+        networks = getAllNetworksFromExpectSections(
+            m_testInputObject.at("expect").get_array(), testType::StateTest);
     }
     else
     {

test/tools/libtesteth/ImportTest.h

@@ -43,8 +43,15 @@ class ImportTest
 	static json_spirit::mObject makeAllFieldsHex(json_spirit::mObject const& _o, bool _isHeader = false);
     static void parseJsonStrValueIntoSet(
         json_spirit::mValue const& _json, std::set<std::string>& _out);
+
+    enum testType
+    {
+        StateTest,
+        BlockchainTest
+    };
     static std::set<eth::Network> getAllNetworksFromExpectSections(
-        json_spirit::mArray const& _expects);
+        json_spirit::mArray const& _expects, testType _testType);
+
 
     //check functions
 	//check that networks in the vector are allowed