xMerge remote-tracking branch 'upstream/develop' into JSON_testContract

1 files changed, 2 insertions, 2 deletions

diff --git a/stateOriginal.cpp b/stateOriginal.cpp
index e1a3c7c4..7f337148 100644
--- a/stateOriginal.cpp
+++ b/stateOriginal.cpp
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(Complex)
 	CanonBlockChain bc;
 	cout << bc;
 
-	State s(stateDB, BaseState::Empty, myMiner.address());
+	State s(stateDB, BaseState::CanonGenesis, myMiner.address());
 	cout << s;
 
 	// Sync up - this won't do much until we use the last state.
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE(Complex)
 	cout << s;
 
 	// Inject a transaction to transfer funds from miner to me.
-	Transaction t(1000, 10000, 10000, me.address(), bytes(), s.transactionsFrom(myMiner.address()), myMiner.secret());
+	Transaction t(1000, 10000, 100000, me.address(), bytes(), s.transactionsFrom(myMiner.address()), myMiner.secret());
 	assert(t.sender() == myMiner.address());
 	s.execute(bc.lastHashes(), t);