diff --git a/libdevcore/TrieDB.h b/libdevcore/TrieDB.h index 13a520311..f9d7bff5f 100644 --- a/libdevcore/TrieDB.h +++ b/libdevcore/TrieDB.h @@ -32,7 +32,6 @@ #include #include #include "MemoryDB.h" -#include "OverlayDB.h" #include "TrieCommon.h" namespace ldb = leveldb; diff --git a/libdevcore/OverlayDB.cpp b/libdevcrypto/OverlayDB.cpp similarity index 100% rename from libdevcore/OverlayDB.cpp rename to libdevcrypto/OverlayDB.cpp diff --git a/libdevcore/OverlayDB.h b/libdevcrypto/OverlayDB.h similarity index 97% rename from libdevcore/OverlayDB.h rename to libdevcrypto/OverlayDB.h index 2e5428bdf..b37d2c11b 100644 --- a/libdevcore/OverlayDB.h +++ b/libdevcrypto/OverlayDB.h @@ -29,7 +29,7 @@ #include #include #include -#include "MemoryDB.h" +#include namespace ldb = leveldb; namespace dev diff --git a/libethereum/CachedAddressState.cpp b/libethereum/CachedAddressState.cpp index 7c2f0a80c..757aef466 100644 --- a/libethereum/CachedAddressState.cpp +++ b/libethereum/CachedAddressState.cpp @@ -21,8 +21,9 @@ #include "CachedAddressState.h" -#include #include +#include +#include #include "Account.h" using namespace std; using namespace dev; @@ -57,8 +58,8 @@ std::unordered_map CachedAddressState::storage() const if (m_r) { SecureTrieDB memdb(const_cast(m_o), m_r[2].toHash()); // promise we won't alter the overlay! :) -// for (auto const& j: memdb) -// ret[j.first] = RLP(j.second).toInt(); + for (auto const& j: memdb) + ret[j.first] = RLP(j.second).toInt(); } if (m_s) for (auto const& j: m_s->storageOverlay()) diff --git a/libethereum/State.h b/libethereum/State.h index 971c2220a..f46d0e222 100644 --- a/libethereum/State.h +++ b/libethereum/State.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/test/deprecated/main.cpp b/test/deprecated/main.cpp index 6cb098228..47e96f337 100644 --- a/test/deprecated/main.cpp +++ b/test/deprecated/main.cpp @@ -20,10 +20,6 @@ * Main test functions. */ -#include -#include "TrieHash.h" -#include "MemTrie.h" - #include int trieTest();