Browse Source

Move paths so default build dir is cpp-ethereum/build.

cl-refactor
Gav Wood 11 years ago
parent
commit
2368a8cd50
  1. 2
      .gitignore
  2. 2
      alethzero/MainWin.cpp
  3. 4
      libethereum/State.cpp
  4. 6
      test/vm.cpp

2
.gitignore

@ -23,4 +23,6 @@ ipch
*.user.* *.user.*
*~ *~
build/
*.pyc *.pyc

2
alethzero/MainWin.cpp

@ -199,6 +199,8 @@ Main::Main(QWidget *parent) :
} }
#endif #endif
cnote << "Genesis RLP:" << toHex(BlockInfo::createGenesisBlock());
ui->configDock->close(); ui->configDock->close();
on_verbosity_sliderMoved(); on_verbosity_sliderMoved();

4
libethereum/State.cpp

@ -82,10 +82,10 @@ State::State(Address _coinbaseAddress, Overlay const& _db):
m_state.init(); m_state.init();
eth::commit(genesisState(), m_db, m_state); eth::commit(genesisState(), m_db, m_state);
m_db.commit(); m_db.commit();
// cnote << "State root: " << m_state.root(); cnote << "State root: " << m_state.root();
m_previousBlock = BlockInfo::genesis(); m_previousBlock = BlockInfo::genesis();
// cnote << "Genesis hash:" << m_previousBlock.hash; cnote << "Genesis hash:" << m_previousBlock.hash;
resetCurrent(); resetCurrent();
assert(m_state.root() == m_previousBlock.stateRoot); assert(m_state.root() == m_previousBlock.stateRoot);

6
test/vm.cpp

@ -472,11 +472,11 @@ BOOST_AUTO_TEST_CASE(vm_tests)
{ {
cnote << "Populating VM tests..."; cnote << "Populating VM tests...";
json_spirit::mValue v; 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."); BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty.");
json_spirit::read_string(s, v); json_spirit::read_string(s, v);
eth::test::doTests(v, true); 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) catch( std::exception& e)
{ {
@ -488,7 +488,7 @@ BOOST_AUTO_TEST_CASE(vm_tests)
{ {
cnote << "Testing VM..."; cnote << "Testing VM...";
json_spirit::mValue v; 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?"); 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); json_spirit::read_string(s, v);
eth::test::doTests(v, false); eth::test::doTests(v, false);

Loading…
Cancel
Save