diff options
-rw-r--r-- | fork.cpp | 2 | ||||
-rw-r--r-- | genesis.cpp | 8 | ||||
-rw-r--r-- | state.cpp | 2 | ||||
-rw-r--r-- | stateOriginal.cpp | 4 | ||||
-rw-r--r-- | txTest.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
@@ -23,7 +23,7 @@ #include <boost/test/unit_test.hpp> #include <boost/filesystem/operations.hpp> #include <libethereum/Client.h> -#include <libethereum/BlockChain.h> +#include <libethereum/CanonBlockChain.h> #include <libethereum/EthereumHost.h> #include "TestHelper.h" using namespace std; diff --git a/genesis.cpp b/genesis.cpp index 8cdb8402..7ca741ee 100644 --- a/genesis.cpp +++ b/genesis.cpp @@ -24,7 +24,7 @@ #include <random> #include "JsonSpiritHeaders.h" #include <libdevcore/CommonIO.h> -#include <libethereum/BlockChain.h> +#include <libethereum/CanonBlockChain.h> #include <boost/test/unit_test.hpp> #include "TestHelper.h" @@ -58,9 +58,9 @@ BOOST_AUTO_TEST_CASE(genesis_tests) js::mObject o = v.get_obj(); - BOOST_CHECK_EQUAL(BlockChain::genesis().stateRoot, h256(o["genesis_state_root"].get_str())); - BOOST_CHECK_EQUAL(toHex(BlockChain::createGenesisBlock()), toHex(fromHex(o["genesis_rlp_hex"].get_str()))); - BOOST_CHECK_EQUAL(BlockInfo::headerHash(BlockChain::createGenesisBlock()), h256(o["genesis_hash"].get_str())); + BOOST_CHECK_EQUAL(CanonBlockChain::genesis().stateRoot, h256(o["genesis_state_root"].get_str())); + BOOST_CHECK_EQUAL(toHex(CanonBlockChain::createGenesisBlock()), toHex(fromHex(o["genesis_rlp_hex"].get_str()))); + BOOST_CHECK_EQUAL(BlockInfo::headerHash(CanonBlockChain::createGenesisBlock()), h256(o["genesis_hash"].get_str())); } BOOST_AUTO_TEST_SUITE_END() @@ -24,7 +24,7 @@ #include <boost/test/unit_test.hpp> #include "JsonSpiritHeaders.h" #include <libdevcore/CommonIO.h> -#include <libethereum/BlockChain.h> +#include <libethereum/CanonBlockChain.h> #include <libethereum/State.h> #include <libethereum/ExtVM.h> #include <libethereum/Defaults.h> diff --git a/stateOriginal.cpp b/stateOriginal.cpp index b1a7c0d8..65ff5084 100644 --- a/stateOriginal.cpp +++ b/stateOriginal.cpp @@ -22,7 +22,7 @@ #include <boost/filesystem/operations.hpp> #include <secp256k1/secp256k1.h> -#include <libethereum/BlockChain.h> +#include <libethereum/CanonBlockChain.h> #include <libethereum/State.h> #include <libethereum/Defaults.h> using namespace std; @@ -40,7 +40,7 @@ int stateTest() Defaults::setDBPath(boost::filesystem::temp_directory_path().string()); OverlayDB stateDB = State::openDB(); - BlockChain bc; + CanonBlockChain bc; State s(myMiner.address(), stateDB); cout << bc; @@ -23,7 +23,7 @@ #include <boost/test/unit_test.hpp> #include <boost/filesystem/operations.hpp> #include <libethereum/Client.h> -#include <libethereum/BlockChain.h> +#include <libethereum/CanonBlockChain.h> #include <libethereum/EthereumHost.h> #include "TestHelper.h" using namespace std; |