diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-02-28 02:32:05 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2018-02-28 03:08:24 +0800 |
| commit | 0346f723422698158b4d5d9b4d7737d185cd8e52 (patch) | |
| tree | 9dfa08149c535c0a613e6e1cf853ba35074d9543 | |
| parent | 029e19983cdc444749258d21b448e52c48d2088d (diff) | |
| download | dexon-solidity-0346f723422698158b4d5d9b4d7737d185cd8e52.tar dexon-solidity-0346f723422698158b4d5d9b4d7737d185cd8e52.tar.gz dexon-solidity-0346f723422698158b4d5d9b4d7737d185cd8e52.tar.bz2 dexon-solidity-0346f723422698158b4d5d9b4d7737d185cd8e52.tar.lz dexon-solidity-0346f723422698158b4d5d9b4d7737d185cd8e52.tar.xz dexon-solidity-0346f723422698158b4d5d9b4d7737d185cd8e52.tar.zst dexon-solidity-0346f723422698158b4d5d9b4d7737d185cd8e52.zip | |
Use compileContract in contract tests
| -rw-r--r-- | test/contracts/AuctionRegistrar.cpp | 9 | ||||
| -rw-r--r-- | test/contracts/FixedFeeRegistrar.cpp | 9 | ||||
| -rw-r--r-- | test/contracts/Wallet.cpp | 9 |
3 files changed, 6 insertions, 21 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp index c9c744af..5e4991e2 100644 --- a/test/contracts/AuctionRegistrar.cpp +++ b/test/contracts/AuctionRegistrar.cpp @@ -220,13 +220,8 @@ protected: void deployRegistrar() { if (!s_compiledRegistrar) - { - m_compiler.reset(false); - m_compiler.addSource("", registrarCode); - m_compiler.setOptimiserSettings(m_optimize, m_optimizeRuns); - BOOST_REQUIRE_MESSAGE(m_compiler.compile(), "Compiling contract failed"); - s_compiledRegistrar.reset(new bytes(m_compiler.object("GlobalRegistrar").bytecode)); - } + s_compiledRegistrar.reset(new bytes(compileContract(registrarCode, "GlobalRegistrar"))); + sendMessage(*s_compiledRegistrar, true); BOOST_REQUIRE(!m_output.empty()); } diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp index 8327999d..a3a27c37 100644 --- a/test/contracts/FixedFeeRegistrar.cpp +++ b/test/contracts/FixedFeeRegistrar.cpp @@ -132,13 +132,8 @@ protected: void deployRegistrar() { if (!s_compiledRegistrar) - { - m_compiler.reset(false); - m_compiler.addSource("", registrarCode); - m_compiler.setOptimiserSettings(m_optimize, m_optimizeRuns); - BOOST_REQUIRE_MESSAGE(m_compiler.compile(), "Compiling contract failed"); - s_compiledRegistrar.reset(new bytes(m_compiler.object("FixedFeeRegistrar").bytecode)); - } + s_compiledRegistrar.reset(new bytes(compileContract(registrarCode, "FixedFeeRegistrar"))); + sendMessage(*s_compiledRegistrar, true); BOOST_REQUIRE(!m_output.empty()); } diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp index 90334ad6..1031e8f1 100644 --- a/test/contracts/Wallet.cpp +++ b/test/contracts/Wallet.cpp @@ -447,13 +447,8 @@ protected: ) { if (!s_compiledWallet) - { - m_compiler.reset(false); - m_compiler.addSource("", walletCode); - m_compiler.setOptimiserSettings(m_optimize, m_optimizeRuns); - BOOST_REQUIRE_MESSAGE(m_compiler.compile(), "Compiling contract failed"); - s_compiledWallet.reset(new bytes(m_compiler.object("Wallet").bytecode)); - } + s_compiledWallet.reset(new bytes(compileContract(walletCode, "Wallet"))); + bytes args = encodeArgs(u256(0x60), _required, _dailyLimit, u256(_owners.size()), _owners); sendMessage(*s_compiledWallet + args, true, _value); BOOST_REQUIRE(!m_output.empty()); |