diff options
| -rw-r--r-- | MemTrie.cpp | 3 | ||||
| -rw-r--r-- | MemTrie.h | 4 | ||||
| -rw-r--r-- | TrieHash.cpp | 3 | ||||
| -rw-r--r-- | TrieHash.h | 4 | ||||
| -rw-r--r-- | crypto.cpp | 6 | ||||
| -rw-r--r-- | dagger.cpp | 2 | ||||
| -rw-r--r-- | hexPrefix.cpp | 4 | ||||
| -rw-r--r-- | main.cpp | 4 | ||||
| -rw-r--r-- | rlp.cpp | 6 | ||||
| -rw-r--r-- | trie.cpp | 2 | ||||
| -rw-r--r-- | vm.cpp | 8 |
11 files changed, 24 insertions, 22 deletions
diff --git a/MemTrie.cpp b/MemTrie.cpp index d7f4e7d0..5c819ffb 100644 --- a/MemTrie.cpp +++ b/MemTrie.cpp @@ -21,7 +21,8 @@ #include "MemTrie.h" -#include <libethsupport/TrieCommon.h> +#include <libethcore/TrieCommon.h> +#include <libethcore/SHA3.h> #include <libethcore/CommonEth.h> using namespace std; using namespace eth; @@ -21,8 +21,8 @@ #pragma once -#include <libethsupport/Common.h> -#include <libethsupport/FixedHash.h> +#include <libethential/Common.h> +#include <libethential/FixedHash.h> namespace eth { diff --git a/TrieHash.cpp b/TrieHash.cpp index f6b73014..8f4161a1 100644 --- a/TrieHash.cpp +++ b/TrieHash.cpp @@ -21,7 +21,8 @@ #include "TrieHash.h" -#include <libethsupport/TrieCommon.h> +#include <libethcore/TrieCommon.h> +#include <libethcore/SHA3.h> #include <libethcore/CommonEth.h> using namespace std; using namespace eth; @@ -21,8 +21,8 @@ #pragma once -#include <libethsupport/Common.h> -#include <libethsupport/FixedHash.h> +#include <libethential/Common.h> +#include <libethential/FixedHash.h> namespace eth { @@ -22,9 +22,9 @@ #include <random> #include <secp256k1/secp256k1.h> -#include <libethsupport/Common.h> -#include <libethsupport/RLP.h> -#include <libethsupport/Log.h> +#include <libethential/Common.h> +#include <libethential/RLP.h> +#include <libethential/Log.h> #include <libethereum/Transaction.h> #include <boost/test/unit_test.hpp> @@ -21,7 +21,7 @@ */ #include <chrono> -#include <libethsupport/Log.h> +#include <libethential/Log.h> #include <libethcore/Dagger.h> using namespace std; using namespace std::chrono; diff --git a/hexPrefix.cpp b/hexPrefix.cpp index 871e86f0..5ea67092 100644 --- a/hexPrefix.cpp +++ b/hexPrefix.cpp @@ -22,8 +22,8 @@ #include <fstream> #include "JsonSpiritHeaders.h" -#include <libethsupport/TrieCommon.h> -#include <libethsupport/Log.h> +#include <libethcore/TrieCommon.h> +#include <libethential/Log.h> #include <boost/test/unit_test.hpp> using namespace std; @@ -20,7 +20,7 @@ * Main test functions. */ -#include <libethsupport/TrieDB.h> +#include <libethcore/TrieDB.h> #include "TrieHash.h" #include "MemTrie.h" @@ -35,7 +35,7 @@ int vmTest(); int hexPrefixTest(); int peerTest(int argc, char** argv); -#include <libethsupport/Log.h> +#include <libethential/Log.h> #include <libethcore/BlockInfo.h> using namespace std; using namespace eth; @@ -23,9 +23,9 @@ #include <fstream> #include <sstream> #include "JsonSpiritHeaders.h" -#include <libethsupport/Log.h> -#include <libethsupport/RLP.h> -#include <libethsupport/Common.h> +#include <libethential/Log.h> +#include <libethential/RLP.h> +#include <libethential/Common.h> #include <boost/test/unit_test.hpp> #include <algorithm> @@ -23,7 +23,7 @@ #include <fstream> #include <random> #include "JsonSpiritHeaders.h" -#include <libethsupport/TrieDB.h> +#include <libethcore/TrieDB.h> #include "TrieHash.h" #include "MemTrie.h" #include <boost/test/unit_test.hpp> @@ -22,8 +22,8 @@ #include <fstream> #include <cstdint> -#include <libethsupport/Log.h> -#include <libethcore/Instruction.h> +#include <libethential/Log.h> +#include <libevmface/Instruction.h> #include <libevm/ExtVMFace.h> #include <libevm/VM.h> #include <liblll/Compiler.h> @@ -470,7 +470,7 @@ void doTests(json_spirit::mValue& v, bool _fillin) BOOST_AUTO_TEST_CASE(vm_tests) { // Populate tests first: - try + /*try { cnote << "Populating VM tests..."; json_spirit::mValue v; @@ -483,7 +483,7 @@ BOOST_AUTO_TEST_CASE(vm_tests) catch (std::exception const& e) { BOOST_ERROR("Failed VM Test with Exception: " << e.what()); - } + }*/ try { |