From 2368a8cd503ae7e1232d6cc566ae03d0a2cd07d0 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 13 May 2014 16:05:27 +0100 Subject: [PATCH] Move paths so default build dir is cpp-ethereum/build. --- .gitignore | 2 ++ alethzero/MainWin.cpp | 2 ++ libethereum/State.cpp | 4 ++-- test/vm.cpp | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1bf55fed8..6f0187dad 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ ipch *.user.* *~ +build/ + *.pyc diff --git a/alethzero/MainWin.cpp b/alethzero/MainWin.cpp index baec6f938..648703ac1 100644 --- a/alethzero/MainWin.cpp +++ b/alethzero/MainWin.cpp @@ -199,6 +199,8 @@ Main::Main(QWidget *parent) : } #endif + cnote << "Genesis RLP:" << toHex(BlockInfo::createGenesisBlock()); + ui->configDock->close(); on_verbosity_sliderMoved(); diff --git a/libethereum/State.cpp b/libethereum/State.cpp index 8d62017ec..19aec35b8 100644 --- a/libethereum/State.cpp +++ b/libethereum/State.cpp @@ -82,10 +82,10 @@ State::State(Address _coinbaseAddress, Overlay const& _db): m_state.init(); eth::commit(genesisState(), m_db, m_state); m_db.commit(); -// cnote << "State root: " << m_state.root(); + cnote << "State root: " << m_state.root(); m_previousBlock = BlockInfo::genesis(); -// cnote << "Genesis hash:" << m_previousBlock.hash; + cnote << "Genesis hash:" << m_previousBlock.hash; resetCurrent(); assert(m_state.root() == m_previousBlock.stateRoot); diff --git a/test/vm.cpp b/test/vm.cpp index af3fd4a3f..a7ad8daa0 100644 --- a/test/vm.cpp +++ b/test/vm.cpp @@ -472,11 +472,11 @@ BOOST_AUTO_TEST_CASE(vm_tests) { cnote << "Populating VM tests..."; json_spirit::mValue v; - string s = asString(contents("../../cpp-ethereum/test/vmtests.json")); + string s = asString(contents("../../../cpp-ethereum/test/vmtests.json")); BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty."); json_spirit::read_string(s, v); eth::test::doTests(v, true); - writeFile("../../tests/vmtests.json", asBytes(json_spirit::write_string(v, true))); + writeFile("../../../tests/vmtests.json", asBytes(json_spirit::write_string(v, true))); } catch( std::exception& e) { @@ -488,7 +488,7 @@ BOOST_AUTO_TEST_CASE(vm_tests) { cnote << "Testing VM..."; json_spirit::mValue v; - string s = asString(contents("../../tests/vmtests.json")); + string s = asString(contents("../../../tests/vmtests.json")); BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty. Have you cloned the 'tests' repo branch develop?"); json_spirit::read_string(s, v); eth::test::doTests(v, false);