aboutsummaryrefslogtreecommitdiffstats
path: root/test/contracts/Wallet.cpp
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-07-31 22:14:46 +0800
committerGitHub <noreply@github.com>2017-07-31 22:14:46 +0800
commitc2215d4605d1fbcef1366d6b822ec610fc031b3c (patch)
tree940ba55f0f27e8884332eaf90c11da48d5e98980 /test/contracts/Wallet.cpp
parent0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14 (diff)
parent2abfdb65c8dcda6866143280b7ff1bde094a1419 (diff)
downloaddexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar
dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.gz
dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.bz2
dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.lz
dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.xz
dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.tar.zst
dexon-solidity-c2215d4605d1fbcef1366d6b822ec610fc031b3c.zip
Merge pull request #2667 from ethereum/develop
Merge develop into release in proparation for 0.4.14
Diffstat (limited to 'test/contracts/Wallet.cpp')
-rw-r--r--test/contracts/Wallet.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
index ef345d86..d12b7493 100644
--- a/test/contracts/Wallet.cpp
+++ b/test/contracts/Wallet.cpp
@@ -450,7 +450,8 @@ protected:
{
m_compiler.reset(false);
m_compiler.addSource("", walletCode);
- ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize, m_optimizeRuns), "Compiling contract failed");
+ m_compiler.setOptimiserSettings(m_optimize, m_optimizeRuns);
+ ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(), "Compiling contract failed");
s_compiledWallet.reset(new bytes(m_compiler.object("Wallet").bytecode));
}
bytes args = encodeArgs(u256(0x60), _required, _dailyLimit, u256(_owners.size()), _owners);