diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-07-26 22:37:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 22:37:16 +0800 |
| commit | 43002b7bb8973e02919f23dcea099cb9877e9579 (patch) | |
| tree | 6270037929123b5a95038a6bd7f3b6a305d516ac /test/contracts | |
| parent | 887823dca6e244d4dae84ca545fe3f0e8170b3d0 (diff) | |
| parent | 30012db396793efad5dba9a2bbb64d34994709ce (diff) | |
| download | dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.gz dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.bz2 dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.lz dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.xz dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.tar.zst dexon-solidity-43002b7bb8973e02919f23dcea099cb9877e9579.zip | |
Merge pull request #2599 from ethereum/compilerstack-cleanup
Cleanup compilerstack (remove old methods and clean compile)
Diffstat (limited to 'test/contracts')
| -rw-r--r-- | test/contracts/AuctionRegistrar.cpp | 3 | ||||
| -rw-r--r-- | test/contracts/FixedFeeRegistrar.cpp | 3 | ||||
| -rw-r--r-- | test/contracts/Wallet.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp index fb8c1c68..773b14b9 100644 --- a/test/contracts/AuctionRegistrar.cpp +++ b/test/contracts/AuctionRegistrar.cpp @@ -223,7 +223,8 @@ protected: { m_compiler.reset(false); m_compiler.addSource("", registrarCode); - 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_compiledRegistrar.reset(new bytes(m_compiler.object("GlobalRegistrar").bytecode)); } sendMessage(*s_compiledRegistrar, true); diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp index d2904b5f..967d60b6 100644 --- a/test/contracts/FixedFeeRegistrar.cpp +++ b/test/contracts/FixedFeeRegistrar.cpp @@ -135,7 +135,8 @@ protected: { m_compiler.reset(false); m_compiler.addSource("", registrarCode); - 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_compiledRegistrar.reset(new bytes(m_compiler.object("FixedFeeRegistrar").bytecode)); } sendMessage(*s_compiledRegistrar, true); 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); |