diff options
author | subtly <subtly@users.noreply.github.com> | 2015-06-20 09:08:06 +0800 |
---|---|---|
committer | subtly <subtly@users.noreply.github.com> | 2015-06-20 09:08:06 +0800 |
commit | b2ddbaec027f14cb804f85ca0dfa2fcdfbbb686f (patch) | |
tree | abfaa5147d476810fca0b5d5adedf86fe6dce99e /libsolidity/solidityExecutionFramework.h | |
parent | ae2213effc1e8b073cb4dc730735ba01d5651b8b (diff) | |
parent | 2a870afc7b73de8df8fccf1f304c4be2e69bb7cb (diff) | |
download | dexon-solidity-b2ddbaec027f14cb804f85ca0dfa2fcdfbbb686f.tar dexon-solidity-b2ddbaec027f14cb804f85ca0dfa2fcdfbbb686f.tar.gz dexon-solidity-b2ddbaec027f14cb804f85ca0dfa2fcdfbbb686f.tar.bz2 dexon-solidity-b2ddbaec027f14cb804f85ca0dfa2fcdfbbb686f.tar.lz dexon-solidity-b2ddbaec027f14cb804f85ca0dfa2fcdfbbb686f.tar.xz dexon-solidity-b2ddbaec027f14cb804f85ca0dfa2fcdfbbb686f.tar.zst dexon-solidity-b2ddbaec027f14cb804f85ca0dfa2fcdfbbb686f.zip |
Merge branch 'develop' into rlpx
Diffstat (limited to 'libsolidity/solidityExecutionFramework.h')
-rw-r--r-- | libsolidity/solidityExecutionFramework.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/libsolidity/solidityExecutionFramework.h b/libsolidity/solidityExecutionFramework.h index 4ba22981..0079d82b 100644 --- a/libsolidity/solidityExecutionFramework.h +++ b/libsolidity/solidityExecutionFramework.h @@ -42,19 +42,29 @@ class ExecutionFramework public: ExecutionFramework() { g_logVerbosity = 0; } - bytes const& compileAndRunWthoutCheck(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "") + bytes const& compileAndRunWithoutCheck( + std::string const& _sourceCode, + u256 const& _value = 0, + std::string const& _contractName = "", + bytes const& _arguments = bytes() + ) { m_compiler.reset(false, m_addStandardSources); m_compiler.addSource("", _sourceCode); ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize, m_optimizeRuns), "Compiling contract failed"); bytes code = m_compiler.getBytecode(_contractName); - sendMessage(code, true, _value); + sendMessage(code + _arguments, true, _value); return m_output; } - bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "") + bytes const& compileAndRun( + std::string const& _sourceCode, + u256 const& _value = 0, + std::string const& _contractName = "", + bytes const& _arguments = bytes() + ) { - compileAndRunWthoutCheck(_sourceCode, _value, _contractName); + compileAndRunWithoutCheck(_sourceCode, _value, _contractName, _arguments); BOOST_REQUIRE(!m_output.empty()); return m_output; } |