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 /state.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 'state.cpp')
| -rw-r--r-- | state.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -57,13 +57,12 @@ void doStateTests(json_spirit::mValue& v, bool _fillin) ImportTest importer(o, _fillin); State theState = importer.m_statePre; - bytes tx = importer.m_transaction.rlp(); bytes output; try { Listener::ExecTimeGuard guard{i.first}; - output = theState.execute(lastHashes(importer.m_environment.currentBlock.number), tx).output; + output = theState.execute(lastHashes(importer.m_environment.currentBlock.number), importer.m_transaction).output; } catch (Exception const& _e) { |