diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-06-18 21:13:08 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-06-18 21:13:08 +0800 |
| commit | 77f8b992ab26f533b1ddb0fe2f31ae8c2dab617a (patch) | |
| tree | 86f1910387e6f85a9dbf0c4034c8137978b76b58 /libsolidity/solidityExecutionFramework.h | |
| parent | 59e24c714c9e55ec60690271787c61e8a708fbec (diff) | |
| parent | 6c27ef73670185e5adf8f84c4bcfbf9ce860defd (diff) | |
| download | dexon-solidity-77f8b992ab26f533b1ddb0fe2f31ae8c2dab617a.tar dexon-solidity-77f8b992ab26f533b1ddb0fe2f31ae8c2dab617a.tar.gz dexon-solidity-77f8b992ab26f533b1ddb0fe2f31ae8c2dab617a.tar.bz2 dexon-solidity-77f8b992ab26f533b1ddb0fe2f31ae8c2dab617a.tar.lz dexon-solidity-77f8b992ab26f533b1ddb0fe2f31ae8c2dab617a.tar.xz dexon-solidity-77f8b992ab26f533b1ddb0fe2f31ae8c2dab617a.tar.zst dexon-solidity-77f8b992ab26f533b1ddb0fe2f31ae8c2dab617a.zip | |
Merge remote-tracking branch 'upstream/develop' into moreTests
Diffstat (limited to 'libsolidity/solidityExecutionFramework.h')
| -rw-r--r-- | libsolidity/solidityExecutionFramework.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/solidityExecutionFramework.h b/libsolidity/solidityExecutionFramework.h index 44590b1c..4ba22981 100644 --- a/libsolidity/solidityExecutionFramework.h +++ b/libsolidity/solidityExecutionFramework.h @@ -174,11 +174,11 @@ protected: BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress)); BOOST_REQUIRE(!executive.call(m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas)); } - BOOST_REQUIRE(executive.go()); + BOOST_REQUIRE(executive.go(/* DEBUG eth::Executive::simpleTrace() */)); m_state.noteSending(m_sender); executive.finalize(); - m_gasUsed = executive.gasUsed(); - m_output = std::move(res.output); // FIXME: Looks like Framework needs ExecutiveResult embedded + m_gasUsed = res.gasUsed; + m_output = std::move(res.output); m_logs = executive.logs(); } |