diff options
author | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-03-31 17:44:00 +0800 |
---|---|---|
committer | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-03-31 17:44:00 +0800 |
commit | 7fb437d0da0819c034b659f7a8ce4f35dd2a8b69 (patch) | |
tree | f2d75a61bc330b1c897d897e65251e9a0a4a9f5f /stateOriginal.cpp | |
parent | f07089ffa390c02a81c1dd057329cd34797d5eec (diff) | |
parent | 8860f8d4c3590423f486559b11bf6c2db9bbab7a (diff) | |
download | dexon-solidity-7fb437d0da0819c034b659f7a8ce4f35dd2a8b69.tar dexon-solidity-7fb437d0da0819c034b659f7a8ce4f35dd2a8b69.tar.gz dexon-solidity-7fb437d0da0819c034b659f7a8ce4f35dd2a8b69.tar.bz2 dexon-solidity-7fb437d0da0819c034b659f7a8ce4f35dd2a8b69.tar.lz dexon-solidity-7fb437d0da0819c034b659f7a8ce4f35dd2a8b69.tar.xz dexon-solidity-7fb437d0da0819c034b659f7a8ce4f35dd2a8b69.tar.zst dexon-solidity-7fb437d0da0819c034b659f7a8ce4f35dd2a8b69.zip |
Merge remote-tracking branch 'upstream/develop' into evmjit
Diffstat (limited to 'stateOriginal.cpp')
-rw-r--r-- | stateOriginal.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/stateOriginal.cpp b/stateOriginal.cpp index 5b7b0415..384d8534 100644 --- a/stateOriginal.cpp +++ b/stateOriginal.cpp @@ -79,13 +79,9 @@ BOOST_AUTO_TEST_CASE(Complex) cout << s; // Inject a transaction to transfer funds from miner to me. - bytes tx; - { - Transaction t(1000, 10000, 10000, me.address(), bytes(), s.transactionsFrom(myMiner.address()), myMiner.secret()); - assert(t.sender() == myMiner.address()); - tx = t.rlp(); - } - s.execute(bc, tx); + Transaction t(1000, 10000, 10000, me.address(), bytes(), s.transactionsFrom(myMiner.address()), myMiner.secret()); + assert(t.sender() == myMiner.address()); + s.execute(bc.lastHashes(), t); cout << s; |