Merge pull request #147 from ethereum/develop

version 0.2.1 development

Author: winsvega

CMakeLists.txt

@@ -14,8 +14,8 @@ HunterGate(
 	LOCAL
 )
 
-project(retesteth VERSION 0.2.0)
-set(VERSION_SUFFIX "memory")
+project(retesteth VERSION 0.2.1)
+set(VERSION_SUFFIX "difficulty")
 
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)

retesteth/FileSystem.h

@@ -0,0 +1,42 @@
+#pragma once
+#include <boost/filesystem.hpp>
+
+namespace test {
+namespace fsmacro {
+
+// https://stackoverflow.com/questions/1872220/is-it-possible-to-iterate-over-arguments-in-variadic-macros
+// Make a FOREACH macro
+#define FE_0(WHAT)
+#define FE_1(WHAT, X) WHAT(X)
+#define FE_2(WHAT, X, ...) WHAT(X)FE_1(WHAT, __VA_ARGS__)
+#define FE_3(WHAT, X, ...) WHAT(X)FE_2(WHAT, __VA_ARGS__)
+#define FE_4(WHAT, X, ...) WHAT(X)FE_3(WHAT, __VA_ARGS__)
+#define FE_5(WHAT, X, ...) WHAT(X)FE_4(WHAT, __VA_ARGS__)
+//... repeat as needed
+
+#define GET_MACRO(_0,_1,_2,_3,_4,_5,NAME,...) NAME
+#define FOR_EACH(action,...) \
+  GET_MACRO(_0,__VA_ARGS__,FE_5,FE_4,FE_3,FE_2,FE_1,FE_0)(action,__VA_ARGS__)
+
+#define OPENFILE(_path) boost::filesystem::ofstream file(_path);
+#define PUTTOFILE(_arg) file << _arg;
+#define CLOSEFILE() \
+    file.close();   \
+    }
+}
+
+#define WRITEFILE(_path, ...)            \
+    {                                    \
+        OPENFILE(_path)                  \
+        FOR_EACH(PUTTOFILE, __VA_ARGS__) \
+        CLOSEFILE()
+
+#define WRITEFILEN(_path, ...) \
+    {                          \
+        OPENFILE(_path)        \
+        FOR_EACH(PUTTOFILE, __VA_ARGS__)
+
+#define ADDTOFILE(_arg) \
+    PUTTOFILE(_arg)
+
+}

retesteth/Options.cpp

@@ -75,6 +75,9 @@ void printHelp()
     cout << setw(30) << "-v <index>" << setw(25) << "Set the transaction value array index when running GeneralStateTests\n";
     cout << setw(30) << "--vmtrace" << setw(25) << "Trace transaction execution\n";
     cout << setw(30) << "--vmtraceraw" << setw(25) << "Trace transaction execution raw format\n";
+    cout << setw(30) << "--vmtrace.nomemory" << setw(25) << "Disable memory in vmtrace/vmtraceraw\n";
+    cout << setw(30) << "--vmtrace.nostack" << setw(25) << "Disable stack in vmtrace/vmtraceraw\n";
+    cout << setw(30) << "--vmtrace.noreturndata" << setw(25) << "Disable returndata in vmtrace/vmtraceraw\n";
     cout << setw(30) << "--limitblocks" << setw(25) << "Limit the block exectuion in blockchain tests for debug\n";
     cout << setw(30) << "--limitrpc" << setw(25) << "Limit the rpc exectuion in tests for debug\n";
     cout << setw(30) << "--verbosity <level>" << setw(25) << "Set logs verbosity. 0 - silent, 1 - only errors, 2 - informative, >2 - detailed\n";
@@ -202,6 +205,18 @@ Options::Options(int argc, const char** argv)
             vmtrace = true;
             vmtraceraw = true;
         }
+        else if (arg == "--vmtrace.nomemory")
+        {
+            vmtrace_nomemory = true;
+        }
+        else if (arg == "--vmtrace.nostack")
+        {
+            vmtrace_nostack = true;
+        }
+        else if (arg == "--vmtrace.noreturndata")
+        {
+            vmtrace_noreturndata = true;
+        }
         else if (arg == "--jsontrace")
         {
             throwIfNoArgumentFollows();

retesteth/Options.h

@@ -35,8 +35,13 @@ class Options
 
     size_t threadCount = 1;	///< Execute tests on threads
     bool enableClientsOutput = false;  ///< Enable stderr from clients
+
     bool vmtrace = false;              ///< Create EVM execution tracer
     bool vmtraceraw = false;           ///< Create EVM execution tracer. output raw info
+    bool vmtrace_nomemory = false;
+    bool vmtrace_nostack = false;
+    bool vmtrace_noreturndata = false;
+
     bool filltests = false;            ///< Create JSON test files from execution results
     bool showhash = false;  ///< Show filler hash for debug information
     bool checkhash = false; ///< Check that tests are updated from fillers

retesteth/TestHelper.cpp

@@ -576,4 +576,41 @@ fs::path createUniqueTmpDirectory() {
     return tpath / uuidStr;
 }
 
+// RLPStream emulator
+void RLPStreamU::appendRaw(string const& _data)
+{
+    m_data = &_data;
+}
+
+// RLPStream emulator
+string RLPStreamU::outHeader() const
+{
+    // For a single byte whose value is in the [0x00, 0x7f] range, that byte is its own RLP encoding.
+    // Otherwise, if a string is 0-55 bytes long, the RLP encoding consists of a single byte with value 0x80 plus the length of
+    // the string followed by the string. The range of the first byte is thus [0x80, 0xb7]. If a string is more than 55 bytes
+    // long, the RLP encoding consists of a single byte with value 0xb7 plus the length in bytes of the length of the string in
+    // binary form, followed by the length of the string, followed by the string. For example, a length-1024 string would be
+    // encoded as \xb9\x04\x00 followed by the string. The range of the first byte is thus [0xb8, 0xbf].
+
+    // If the total payload of a list (i.e. the combined length of all its items being RLP encoded) is 0-55 bytes long, the RLP
+    // encoding consists of a single byte with value 0xc0 plus the length of the list followed by the concatenation of the RLP
+    // encodings of the items. The range of the first byte is thus [0xc0, 0xf7]. If the total payload of a list is more than 55
+    // bytes long, the RLP encoding consists of a single byte with value 0xf7 plus the length in bytes of the length of the
+    // payload in binary form, followed by the length of the payload, followed by the concatenation of the RLP encodings of the
+    // items. The range of the first byte is thus [0xf8, 0xff].
+
+    (void)m_size;
+    long const payloadSize = (m_data->size() / 2) - 1;
+    size_t header;
+    if (payloadSize > 55)
+    {
+        auto const payloadSizeHex = dev::toCompactHex(payloadSize);
+        header = 247 + payloadSizeHex.size() / 2;
+        return "0x" + dev::toCompactHex(header) + payloadSizeHex;
+    }
+    else
+        header = 192 + payloadSize;
+    return "0x" + dev::toCompactHex(header);
+}
+
 }//namespace

retesteth/TestHelper.h

@@ -128,4 +128,18 @@ string fto_string(t _val)
 {
     return std::to_string(_val);
 }
+
+/// RLP header calculator / Stream Emulator
+class RLPStreamU
+{
+public:
+    RLPStreamU(size_t _size) : m_size(_size) {}
+    void appendRaw(string const& _data);
+    string outHeader() const;
+
+private:
+    size_t m_size;
+    string const* m_data;
+};
+
 }  // namespace test

retesteth/TestSuite.cpp

@@ -136,15 +136,18 @@ bool addClientInfo(
     bool atLeastOneUpdate = false || Options::get().forceupdate;
     SessionInterface& session = RPCSession::instance(TestOutputHelper::getThreadID());
 
-    spDataObject filledTest(new DataObject());
+    spDataObject filledTest;
     if ((Options::get().filltests && fs::exists(_existingFilledTest)) && !Options::get().forceupdate)
         filledTest = test::readJsonData(_existingFilledTest);
-    for (auto& testInGenerated : _filledTest.getSubObjectsUnsafe())
+
+    for (spDataObject& testInGenerated : _filledTest.getSubObjectsUnsafe())
     {
         DataObject& testInGeneratedRef = testInGenerated.getContent();
-        spDataObject clientinfo(new DataObject());
+        spDataObject clientinfo;
+
+        // Since one gtest parsed into many bctests we need a copy
         if (testInGeneratedRef.count("_info"))
-            clientinfo = testInGeneratedRef.atKeyPointerUnsafe("_info");
+            clientinfo.getContent().copyFrom(testInGeneratedRef.atKey("_info"));
 
         testInGeneratedRef.removeKey("_info");
         testInGeneratedRef.performModifier(mod_sortKeys);
@@ -163,6 +166,7 @@ bool addClientInfo(
                 string const& existingHash = existingTest.atKey("_info").atKey("generatedTestHash").asString();
                 if (existingHash != clientinfo->atKey("generatedTestHash").asString())
                     atLeastOneUpdate = true;
+
                 string const& existingSrcHash = existingTest.atKey("_info").atKey("sourceHash").asString();
                 if (existingSrcHash != clientinfo->atKey("sourceHash").asString())
                     atLeastOneUpdate = true;
@@ -529,8 +533,10 @@ void TestSuite::runAllTestsInFolder(string const& _testFolder) const
             if (ExitHandler::receivedExitSignal())
                 break;
 
-            thread testThread(&TestSuite::executeTest, this, _testFolder, file);
-            ThreadManager::addTask(std::move(testThread));
+            auto job = [this, &_testFolder, &file](){
+                executeTest(_testFolder, file);
+            };
+            ThreadManager::addTask(job);
         }
         ThreadManager::joinThreads();
         testOutput.finishTest();

retesteth/compiler/Compiler.h

@@ -21,7 +21,7 @@ string encodeAbi(string const& _code);
 class solContracts
 {
 public:
-    solContracts() { m_solContracts = spDataObject(new DataObject()); }
+    solContracts() {}
     void insertCode(string const& _name, string const& _code) { m_solContracts.getContent()[_name] = _code; }
     string const& getCode(string const& _contractName) const;
     std::vector<spDataObject> const& Contracts() const { return m_solContracts->getSubObjects(); }

retesteth/configs/ClientConfig.cpp

@@ -58,17 +58,17 @@ ClientConfig::ClientConfig(fs::path const& _clientConfigPath) : m_id(ClientConfi
         }
 
         // Load correctmining Reward
-        fs::path correctMiningRewardPath = genesisTemplatePath / "correctMiningReward.json";
-        ETH_FAIL_REQUIRE_MESSAGE(fs::exists(correctMiningRewardPath),
+        m_correctMiningRewardPath = genesisTemplatePath / "correctMiningReward.json";
+        ETH_FAIL_REQUIRE_MESSAGE(fs::exists(m_correctMiningRewardPath),
             "correctMiningReward.json client config not found!");
-        spDataObject correctMiningReward = test::readJsonData(correctMiningRewardPath);
+        spDataObject correctMiningReward = test::readJsonData(m_correctMiningRewardPath);
         correctMiningReward.getContent().performModifier(mod_removeComments);
         correctMiningReward.getContent().performModifier(mod_valueToCompactEvenHexPrefixed);
         for (auto const& el : cfgFile().forks())
         {
             if (!correctMiningReward->count(el.asString()))
                 ETH_FAIL_MESSAGE("Correct mining reward missing block reward record for fork: `" +
-                                 el.asString() + "` (" + correctMiningRewardPath.string() + ")");
+                                 el.asString() + "` (" + m_correctMiningRewardPath.string() + ")");
         }
         for (auto const& el : correctMiningReward->getSubObjects())
             m_correctReward[el->getKey()] = spVALUE(new VALUE(correctMiningReward->atKey(el->getKey())));

retesteth/configs/Options.h

@@ -24,6 +24,7 @@ class genConstantinopleFixCfg { public: genConstantinopleFixCfg(); };
 class genIstanbulCfg { public: genIstanbulCfg(); };
 class genBerlinCfg { public: genBerlinCfg(); };
 class genLondonCfg { public: genLondonCfg(); };
+class genArrowGlacierCfg { public: genArrowGlacierCfg(); };
 
 // Transition genesis configs
 class genFrontierToHomesteadCfg { public: genFrontierToHomesteadCfg(); };
@@ -58,6 +59,7 @@ class OptionsInit
         genIstanbulCfg genIstanbuil;
         genBerlinCfg genBerlin;
         genLondonCfg genLondon;
+        genArrowGlacierCfg genArrowGlacier;
 
         // Transition genesis configs
         genFrontierToHomesteadCfg genFrontierToHomestead;