aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian <c@ethdev.com>2015-01-29 08:29:43 +0800
committerChristian <c@ethdev.com>2015-01-29 08:29:43 +0800
commitf054a4af7b56559dccf7406b34b38e05c2b54d5a (patch)
tree8cd24b00494436dc2909432b61b2b19f1b5278f8
parent4e67aa413e16a00c5056eb388bcf3bb011a7be57 (diff)
downloaddexon-solidity-f054a4af7b56559dccf7406b34b38e05c2b54d5a.tar
dexon-solidity-f054a4af7b56559dccf7406b34b38e05c2b54d5a.tar.gz
dexon-solidity-f054a4af7b56559dccf7406b34b38e05c2b54d5a.tar.bz2
dexon-solidity-f054a4af7b56559dccf7406b34b38e05c2b54d5a.tar.lz
dexon-solidity-f054a4af7b56559dccf7406b34b38e05c2b54d5a.tar.xz
dexon-solidity-f054a4af7b56559dccf7406b34b38e05c2b54d5a.tar.zst
dexon-solidity-f054a4af7b56559dccf7406b34b38e05c2b54d5a.zip
Exclude standard contracts by default.
-rw-r--r--SolidityEndToEndTest.cpp1
-rw-r--r--solidityExecutionFramework.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp
index 1ddb2273..5d726f0d 100644
--- a/SolidityEndToEndTest.cpp
+++ b/SolidityEndToEndTest.cpp
@@ -1905,6 +1905,7 @@ BOOST_AUTO_TEST_CASE(use_std_lib)
import "mortal";
contract Icarus is mortal { }
)";
+ m_addStandardSources = true;
u256 amount(130);
u160 address(23);
compileAndRun(sourceCode, amount, "Icarus");
diff --git a/solidityExecutionFramework.h b/solidityExecutionFramework.h
index 208e9ae8..7dad9ad4 100644
--- a/solidityExecutionFramework.h
+++ b/solidityExecutionFramework.h
@@ -45,8 +45,7 @@ public:
bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "")
{
- // add standard sources only if contract name is given
- dev::solidity::CompilerStack compiler(!_contractName.empty());
+ dev::solidity::CompilerStack compiler(m_addStandardSources);
try
{
compiler.addSource("", _sourceCode);
@@ -175,6 +174,7 @@ private:
protected:
bool m_optimize = false;
+ bool m_addStandardSources = false;
Address m_sender;
Address m_contractAddress;
eth::State m_state;