diff options
| author | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-05-21 02:14:38 +0800 |
|---|---|---|
| committer | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-05-21 02:14:38 +0800 |
| commit | d67cacfcba60de5099c19c802398268ac462ed1c (patch) | |
| tree | 4d5306d451cd46a59cdd157402273dbb0f49352b /libsolidity/solidityExecutionFramework.h | |
| parent | 3108f4efe96cf22501227b71b261dfda4f20599c (diff) | |
| parent | e5a4a8fca4832dff79227dc6ed667b7f1c879faf (diff) | |
| download | dexon-solidity-d67cacfcba60de5099c19c802398268ac462ed1c.tar dexon-solidity-d67cacfcba60de5099c19c802398268ac462ed1c.tar.gz dexon-solidity-d67cacfcba60de5099c19c802398268ac462ed1c.tar.bz2 dexon-solidity-d67cacfcba60de5099c19c802398268ac462ed1c.tar.lz dexon-solidity-d67cacfcba60de5099c19c802398268ac462ed1c.tar.xz dexon-solidity-d67cacfcba60de5099c19c802398268ac462ed1c.tar.zst dexon-solidity-d67cacfcba60de5099c19c802398268ac462ed1c.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_refactor
Diffstat (limited to 'libsolidity/solidityExecutionFramework.h')
| -rw-r--r-- | libsolidity/solidityExecutionFramework.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libsolidity/solidityExecutionFramework.h b/libsolidity/solidityExecutionFramework.h index f76465f2..fa25fb12 100644 --- a/libsolidity/solidityExecutionFramework.h +++ b/libsolidity/solidityExecutionFramework.h @@ -44,11 +44,11 @@ public: bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "") { - dev::solidity::CompilerStack compiler(m_addStandardSources); - compiler.addSource("", _sourceCode); - ETH_TEST_REQUIRE_NO_THROW(compiler.compile(m_optimize), "Compiling contract failed"); + m_compiler.reset(false, m_addStandardSources); + m_compiler.addSource("", _sourceCode); + ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize), "Compiling contract failed"); - bytes code = compiler.getBytecode(_contractName); + bytes code = m_compiler.getBytecode(_contractName); sendMessage(code, true, _value); BOOST_REQUIRE(!m_output.empty()); return m_output; @@ -160,12 +160,14 @@ protected: BOOST_REQUIRE(executive.go()); m_state.noteSending(m_sender); executive.finalize(); + m_gasUsed = executive.gasUsed(); m_output = executive.out().toVector(); m_logs = executive.logs(); } bool m_optimize = false; bool m_addStandardSources = false; + dev::solidity::CompilerStack m_compiler; Address m_sender; Address m_contractAddress; eth::State m_state; @@ -173,6 +175,7 @@ protected: u256 const m_gas = 100000000; bytes m_output; eth::LogEntries m_logs; + u256 m_gasUsed; }; } |