diff options
| author | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-03-09 22:05:22 +0800 |
|---|---|---|
| committer | Paweł Bylica <pawel.bylica@imapp.pl> | 2015-03-09 22:05:22 +0800 |
| commit | 5cc0812d357e70614b9a0d78812ae7e6ecaa5ef0 (patch) | |
| tree | 5d59b64355b33260d7c702d4219253f2d2d089f9 /solidityExecutionFramework.h | |
| parent | 5fb44b241debf9230aea69b7708e204a88ba9d83 (diff) | |
| parent | d586a88f3cab21db88f31dd574daac4bb9a28b7d (diff) | |
| download | dexon-solidity-5cc0812d357e70614b9a0d78812ae7e6ecaa5ef0.tar dexon-solidity-5cc0812d357e70614b9a0d78812ae7e6ecaa5ef0.tar.gz dexon-solidity-5cc0812d357e70614b9a0d78812ae7e6ecaa5ef0.tar.bz2 dexon-solidity-5cc0812d357e70614b9a0d78812ae7e6ecaa5ef0.tar.lz dexon-solidity-5cc0812d357e70614b9a0d78812ae7e6ecaa5ef0.tar.xz dexon-solidity-5cc0812d357e70614b9a0d78812ae7e6ecaa5ef0.tar.zst dexon-solidity-5cc0812d357e70614b9a0d78812ae7e6ecaa5ef0.zip | |
Merge remote-tracking branch 'upstream/develop' into evmjit
Diffstat (limited to 'solidityExecutionFramework.h')
| -rw-r--r-- | solidityExecutionFramework.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/solidityExecutionFramework.h b/solidityExecutionFramework.h index 4ef9bfdc..86062a90 100644 --- a/solidityExecutionFramework.h +++ b/solidityExecutionFramework.h @@ -25,7 +25,7 @@ #include <string> #include <tuple> -#include <boost/test/unit_test.hpp> +#include "TestHelper.h" #include <libethereum/State.h> #include <libethereum/Executive.h> #include <libsolidity/CompilerStack.h> @@ -46,16 +46,8 @@ public: bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "") { dev::solidity::CompilerStack compiler(m_addStandardSources); - try - { - compiler.addSource("", _sourceCode); - compiler.compile(m_optimize); - } - catch(boost::exception const& _e) - { - auto msg = std::string("Compiling contract failed with: ") + boost::diagnostic_information(_e); - BOOST_FAIL(msg); - } + compiler.addSource("", _sourceCode); + ETH_TEST_REQUIRE_NO_THROW(compiler.compile(m_optimize), "Compiling contract failed"); bytes code = compiler.getBytecode(_contractName); sendMessage(code, true, _value); @@ -178,7 +170,7 @@ protected: Address m_contractAddress; eth::State m_state; u256 const m_gasPrice = 100 * eth::szabo; - u256 const m_gas = 1000000; + u256 const m_gas = 100000000; bytes m_output; eth::LogEntries m_logs; }; |