Merge pull request #5712 from ethereum/noreward2

fix testeth stateTests transaction execution on expectSections

Author: winsvega

test/tools/libtesteth/ImportTest.cpp

@@ -44,6 +44,19 @@ vector<h256> lastHashes(u256 _currentBlockNumber)
         ret.push_back(sha3(toString(_currentBlockNumber - i)));
     return ret;
 }
+
+vector<int> parseJsonIntValueIntoVector(json_spirit::mValue const& _json)
+{
+    vector<int> out;
+    if (_json.type() == json_spirit::array_type)
+    {
+        for (auto const& val : _json.get_array())
+            out.push_back(val.get_int());
+    }
+    else
+        out.push_back(_json.get_int());
+    return out;
+}
 }
 
 ImportTest::ImportTest(json_spirit::mObject const& _input, json_spirit::mObject& _output):
@@ -205,6 +218,52 @@ set<eth::Network> ImportTest::getAllNetworksFromExpectSections(
     return networkSet;
 }
 
+void ImportTest::parseJsonStrValueIntoSet(json_spirit::mValue const& _json, set<string>& _out)
+{
+    if (_json.type() == json_spirit::array_type)
+    {
+        for (auto const& val : _json.get_array())
+            _out.emplace(val.get_str());
+    }
+    else
+        _out.emplace(_json.get_str());
+}
+
+bool ImportTest::findExpectSectionForTransaction(
+    transactionToExecute const& _tr, eth::Network const& _net, bool _isFilling) const
+{
+    json_spirit::mArray const& expects =
+        _isFilling ? m_testInputObject.at("expect").get_array() :
+                     m_testInputObject.at("post").get_obj().at(netIdToString(_net)).get_array();
+    for (auto const& exp : expects)
+    {
+        json_spirit::mObject const& expSection = exp.get_obj();
+
+        if (_isFilling)
+        {
+            set<string> networkSet;
+            parseJsonStrValueIntoSet(expSection.at("network"), networkSet);
+            networkSet = test::translateNetworks(networkSet);
+            if (!networkSet.count(netIdToString(_net)))
+                continue;
+        }
+
+        BOOST_REQUIRE_MESSAGE(expSection.at("indexes").type() == jsonVType::obj_type,
+            "indexes field expected to be json Object!");
+        json_spirit::mObject const& indexes = expSection.at("indexes").get_obj();
+        vector<int> d = parseJsonIntValueIntoVector(indexes.at("data"));
+        vector<int> g = parseJsonIntValueIntoVector(indexes.at("gas"));
+        vector<int> v = parseJsonIntValueIntoVector(indexes.at("value"));
+        BOOST_CHECK_MESSAGE(d.size() > 0 && g.size() > 0 && v.size() > 0,
+            TestOutputHelper::get().testName() + " Indexes arrays not set!");
+        if ((inArray(d, _tr.dataInd) || inArray(d, -1)) &&
+            (inArray(g, _tr.gasInd) || inArray(g, -1)) &&
+            (inArray(v, _tr.valInd) || inArray(v, -1)))
+            return true;
+    }
+    return false;
+}
+
 bytes ImportTest::executeTest(bool _isFilling)
 {
     assert(m_envInfo);
@@ -231,7 +290,7 @@ bytes ImportTest::executeTest(bool _isFilling)
         if (isDisabledNetwork(net))
             continue;
 
-        for (auto& tr : m_transactions)
+        for (auto const& tr : m_transactions)
         {
             Options const& opt = Options::get();
             if(opt.trDataIndex != -1 && opt.trDataIndex != tr.dataInd)
@@ -241,10 +300,25 @@ bytes ImportTest::executeTest(bool _isFilling)
             if(opt.trValueIndex != -1 && opt.trValueIndex != tr.valInd)
                 continue;
 
-            std::tie(tr.postState, tr.output, tr.changeLog) =
-                    executeTransaction(net, *m_envInfo, m_statePre, tr.transaction);
-            tr.netId = net;
-            transactionResults.push_back(tr);
+            // Skip transaction if there is no expect section for this transaction
+            // (noindex data, gas, val, network)
+            if (!findExpectSectionForTransaction(tr, net, _isFilling))
+                continue;
+
+            transactionToExecute transactionResult = tr;
+            std::tie(transactionResult.postState, transactionResult.output,
+                transactionResult.changeLog) =
+                executeTransaction(net, *m_envInfo, m_statePre, tr.transaction);
+            transactionResult.netId = net;
+            if (Options::get().verbosity > 2)
+            {
+                std::cout << "Executed transaction: \n";
+                std::cerr << "Network: " << netIdToString(transactionResult.netId) << "\n";
+                std::cerr << "Indexes: d: " << transactionResult.dataInd
+                          << " g: " << transactionResult.gasInd
+                          << " v: " << transactionResult.valInd << "\n\n";
+            }
+            transactionResults.push_back(transactionResult);
         }
     }
 
@@ -599,28 +673,6 @@ int ImportTest::compareStates(State const& _stateExpect, State const& _statePost
     return wasError;
 }
 
-void ImportTest::parseJsonStrValueIntoSet(json_spirit::mValue const& _json, set<string>& _out)
-{
-    if (_json.type() == json_spirit::array_type)
-    {
-        for (auto const& val: _json.get_array())
-            _out.emplace(val.get_str());
-    }
-    else
-        _out.emplace(_json.get_str());
-}
-
-void parseJsonIntValueIntoVector(json_spirit::mValue const& _json, vector<int>& _out)
-{
-    if (_json.type() == json_spirit::array_type)
-    {
-        for (auto const& val: _json.get_array())
-            _out.push_back(val.get_int());
-    }
-    else
-        _out.push_back(_json.get_int());
-}
-
 set<string> const& getAllowedNetworks()
 {
     static set<string> allowedNetowks;
@@ -698,9 +750,9 @@ bool ImportTest::checkGeneralTestSectionSearch(json_spirit::mObject const& _expe
         BOOST_REQUIRE_MESSAGE(_expects.at("indexes").type() == jsonVType::obj_type,
                               "indexes field expected to be json Object!");
         json_spirit::mObject const& indexes = _expects.at("indexes").get_obj();
-        parseJsonIntValueIntoVector(indexes.at("data"), d);
-        parseJsonIntValueIntoVector(indexes.at("gas"), g);
-        parseJsonIntValueIntoVector(indexes.at("value"), v);
+        d = parseJsonIntValueIntoVector(indexes.at("data"));
+        g = parseJsonIntValueIntoVector(indexes.at("gas"));
+        v = parseJsonIntValueIntoVector(indexes.at("value"));
         BOOST_CHECK_MESSAGE(d.size() > 0 && g.size() > 0 && v.size() > 0, TestOutputHelper::get().testName() + " Indexes arrays not set!");
 
         //Skip this check if does not fit to options request

test/tools/libtesteth/ImportTest.h

@@ -69,10 +69,13 @@ class ImportTest
 	eth::State m_statePost;
 
 private:
-	using ExecOutput = std::pair<eth::ExecutionResult, eth::TransactionReceipt>;
+    struct transactionToExecute;
+    using ExecOutput = std::pair<eth::ExecutionResult, eth::TransactionReceipt>;
 	std::tuple<eth::State, ExecOutput, eth::ChangeLog> executeTransaction(eth::Network const _sealEngineNetwork, eth::EnvInfo const& _env, eth::State const& _preState, eth::Transaction const& _tr);
+    bool findExpectSectionForTransaction(
+        transactionToExecute const& _tr, eth::Network const& _net, bool _isFilling) const;
 
-	std::unique_ptr<eth::LastBlockHashesFace const> m_lastBlockHashes;
+    std::unique_ptr<eth::LastBlockHashesFace const> m_lastBlockHashes;
 	std::unique_ptr<eth::EnvInfo> m_envInfo;
 	eth::Transaction m_transaction;