diff options
| author | chriseth <c@ethdev.com> | 2015-04-20 20:55:58 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-04-20 20:55:58 +0800 |
| commit | 8caf1f723ffe9c8592e995f6e82571fbe2185fd0 (patch) | |
| tree | bbcd407e41e4bfd4809e576ff355003f799eeb7c /stateOriginal.cpp | |
| parent | 6b08b99b5ef319837f9293cca6fd74803fe4688d (diff) | |
| parent | 71012a83e86dac3a899780219a78f18acd1708c5 (diff) | |
| download | dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.gz dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.bz2 dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.lz dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.xz dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.zst dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
Conflicts:
libsolidity/AST.cpp
libsolidity/AST.h
Diffstat (limited to 'stateOriginal.cpp')
| -rw-r--r-- | stateOriginal.cpp | 4 |
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); |