aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-08-27 01:32:18 +0800
committerGitHub <noreply@github.com>2016-08-27 01:32:18 +0800
commitfb7836d87bba0eacb2454d6c50b1209365a89b6d (patch)
tree81810b473d4ae5f76e2cb97a959ff234382966ac /test
parent69acd25888007c536bef22e350725cf444db58ad (diff)
parent56558c0db2ad1e64aa81aaa05820388c2ba65a45 (diff)
downloaddexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.tar.gz
dexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.tar.zst
dexon-solidity-fb7836d87bba0eacb2454d6c50b1209365a89b6d.zip
Merge pull request #897 from Denton-L/remove-standard
BREAKING: Remove standard contracts
Diffstat (limited to 'test')
-rw-r--r--test/contracts/AuctionRegistrar.cpp2
-rw-r--r--test/contracts/FixedFeeRegistrar.cpp2
-rw-r--r--test/contracts/Wallet.cpp2
-rw-r--r--test/libsolidity/SolidityABIJSON.cpp2
-rw-r--r--test/libsolidity/SolidityEndToEndTest.cpp15
-rw-r--r--test/libsolidity/SolidityExecutionFramework.h3
-rw-r--r--test/libsolidity/SolidityNatspecJSON.cpp2
7 files changed, 6 insertions, 22 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp
index bb2e5663..3b1d1165 100644
--- a/test/contracts/AuctionRegistrar.cpp
+++ b/test/contracts/AuctionRegistrar.cpp
@@ -230,7 +230,7 @@ protected:
if (!s_compiledRegistrar)
{
m_optimize = true;
- m_compiler.reset(false, m_addStandardSources);
+ m_compiler.reset(false);
m_compiler.addSource("", registrarCode);
ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize, m_optimizeRuns), "Compiling contract failed");
s_compiledRegistrar.reset(new bytes(m_compiler.object("GlobalRegistrar").bytecode));
diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp
index 6d79bec6..3acfba62 100644
--- a/test/contracts/FixedFeeRegistrar.cpp
+++ b/test/contracts/FixedFeeRegistrar.cpp
@@ -131,7 +131,7 @@ protected:
if (!s_compiledRegistrar)
{
m_optimize = true;
- m_compiler.reset(false, m_addStandardSources);
+ m_compiler.reset(false);
m_compiler.addSource("", registrarCode);
ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize, m_optimizeRuns), "Compiling contract failed");
s_compiledRegistrar.reset(new bytes(m_compiler.object("FixedFeeRegistrar").bytecode));
diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
index 7a9b0b17..9e797af4 100644
--- a/test/contracts/Wallet.cpp
+++ b/test/contracts/Wallet.cpp
@@ -445,7 +445,7 @@ protected:
if (!s_compiledWallet)
{
m_optimize = true;
- m_compiler.reset(false, m_addStandardSources);
+ m_compiler.reset(false);
m_compiler.addSource("", walletCode);
ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize, m_optimizeRuns), "Compiling contract failed");
s_compiledWallet.reset(new bytes(m_compiler.object("Wallet").bytecode));
diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp
index 77b39978..b21e03eb 100644
--- a/test/libsolidity/SolidityABIJSON.cpp
+++ b/test/libsolidity/SolidityABIJSON.cpp
@@ -35,7 +35,7 @@ namespace test
class JSONInterfaceChecker
{
public:
- JSONInterfaceChecker(): m_compilerStack(false) {}
+ JSONInterfaceChecker(): m_compilerStack() {}
void checkInterface(std::string const& _code, std::string const& _expectedInterfaceString)
{
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index f3cd387a..8a61907a 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -2469,21 +2469,6 @@ BOOST_AUTO_TEST_CASE(function_modifier_for_constructor)
BOOST_CHECK(callContractFunction("getData()") == encodeArgs(4 | 2));
}
-BOOST_AUTO_TEST_CASE(use_std_lib)
-{
- char const* sourceCode = R"(
- import "mortal";
- contract Icarus is mortal { }
- )";
- m_addStandardSources = true;
- u256 amount(130 * ether);
- compileAndRun(sourceCode, amount, "Icarus");
- u256 balanceBefore = balanceAt(m_sender);
- BOOST_CHECK(callContractFunction("kill()") == bytes());
- BOOST_CHECK(!addressHasCode(m_contractAddress));
- BOOST_CHECK(balanceAt(m_sender) > balanceBefore);
-}
-
BOOST_AUTO_TEST_CASE(crazy_elementary_typenames_on_stack)
{
char const* sourceCode = R"(
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
index c34b00ec..f4bdc657 100644
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ b/test/libsolidity/SolidityExecutionFramework.h
@@ -67,7 +67,7 @@ public:
std::map<std::string, Address> const& _libraryAddresses = std::map<std::string, Address>()
)
{
- m_compiler.reset(false, m_addStandardSources);
+ m_compiler.reset(false);
m_compiler.addSource("", _sourceCode);
if (!m_compiler.compile(m_optimize, m_optimizeRuns))
{
@@ -290,7 +290,6 @@ protected:
size_t m_optimizeRuns = 200;
bool m_optimize = false;
- bool m_addStandardSources = false;
dev::solidity::CompilerStack m_compiler;
Address m_sender;
Address m_contractAddress;
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index 8c0c2098..56572b43 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -37,7 +37,7 @@ namespace test
class DocumentationChecker
{
public:
- DocumentationChecker(): m_compilerStack(false) {}
+ DocumentationChecker(): m_compilerStack() {}
void checkNatspec(
std::string const& _code,