Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Commit 2368a8c

Browse files
committed
Move paths so default build dir is cpp-ethereum/build.
1 parent f41e545 commit 2368a8c

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ ipch
2323
*.user.*
2424
*~
2525

26+
build/
27+
2628
*.pyc

alethzero/MainWin.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ Main::Main(QWidget *parent) :
199199
}
200200
#endif
201201

202+
cnote << "Genesis RLP:" << toHex(BlockInfo::createGenesisBlock());
203+
202204
ui->configDock->close();
203205

204206
on_verbosity_sliderMoved();

libethereum/State.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ State::State(Address _coinbaseAddress, Overlay const& _db):
8282
m_state.init();
8383
eth::commit(genesisState(), m_db, m_state);
8484
m_db.commit();
85-
// cnote << "State root: " << m_state.root();
85+
cnote << "State root: " << m_state.root();
8686

8787
m_previousBlock = BlockInfo::genesis();
88-
// cnote << "Genesis hash:" << m_previousBlock.hash;
88+
cnote << "Genesis hash:" << m_previousBlock.hash;
8989
resetCurrent();
9090

9191
assert(m_state.root() == m_previousBlock.stateRoot);

test/vm.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,11 +472,11 @@ BOOST_AUTO_TEST_CASE(vm_tests)
472472
{
473473
cnote << "Populating VM tests...";
474474
json_spirit::mValue v;
475-
string s = asString(contents("../../cpp-ethereum/test/vmtests.json"));
475+
string s = asString(contents("../../../cpp-ethereum/test/vmtests.json"));
476476
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty.");
477477
json_spirit::read_string(s, v);
478478
eth::test::doTests(v, true);
479-
writeFile("../../tests/vmtests.json", asBytes(json_spirit::write_string(v, true)));
479+
writeFile("../../../tests/vmtests.json", asBytes(json_spirit::write_string(v, true)));
480480
}
481481
catch( std::exception& e)
482482
{
@@ -488,7 +488,7 @@ BOOST_AUTO_TEST_CASE(vm_tests)
488488
{
489489
cnote << "Testing VM...";
490490
json_spirit::mValue v;
491-
string s = asString(contents("../../tests/vmtests.json"));
491+
string s = asString(contents("../../../tests/vmtests.json"));
492492
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of 'vmtests.json' is empty. Have you cloned the 'tests' repo branch develop?");
493493
json_spirit::read_string(s, v);
494494
eth::test::doTests(v, false);

0 commit comments

Comments
 (0)