diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-03-30 04:17:12 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-03-30 04:17:12 +0800 |
| commit | 602274c0ef07d9e816e97f47c6d556e0edd00758 (patch) | |
| tree | 5a6ef7b011ec56447882bb5dd00c77ca145b8208 /stateOriginal.cpp | |
| parent | f6aaa7b12f64291a2ef8a723c5a1dd620751d0ac (diff) | |
| parent | 5e28d981c729a929a37ba761e86a47de08ce9456 (diff) | |
| download | dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.gz dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.bz2 dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.lz dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.xz dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.zst dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.zip | |
Merge branch 'develop' into reqpeer
Conflicts:
libp2p/Network.cpp
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; |