cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use compileContract in contract tests

Browse Source
This commit is contained in:
Alex Beregszaszi 2018-02-27 19:32:05 +01:00
parent 029e19983c
commit 0346f72342
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/contracts/AuctionRegistrar.cpp
View File

@ -220,13 +220,8 @@ protected:
void deployRegistrar() void deployRegistrar()
{ {
if (!s_compiledRegistrar) if (!s_compiledRegistrar)
{ s_compiledRegistrar.reset(new bytes(compileContract(registrarCode, "GlobalRegistrar")));
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));
}
sendMessage(*s_compiledRegistrar, true); sendMessage(*s_compiledRegistrar, true);
BOOST_REQUIRE(!m_output.empty()); BOOST_REQUIRE(!m_output.empty());
} }

9
test/contracts/FixedFeeRegistrar.cpp
View File

@ -132,13 +132,8 @@ protected:
void deployRegistrar() void deployRegistrar()
{ {
if (!s_compiledRegistrar) if (!s_compiledRegistrar)
{ s_compiledRegistrar.reset(new bytes(compileContract(registrarCode, "FixedFeeRegistrar")));
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));
}
sendMessage(*s_compiledRegistrar, true); sendMessage(*s_compiledRegistrar, true);
BOOST_REQUIRE(!m_output.empty()); BOOST_REQUIRE(!m_output.empty());
} }

9
test/contracts/Wallet.cpp
View File

@ -447,13 +447,8 @@ protected:
) )
{ {
if (!s_compiledWallet) if (!s_compiledWallet)
{ s_compiledWallet.reset(new bytes(compileContract(walletCode, "Wallet")));
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));
}
bytes args = encodeArgs(u256(0x60), _required, _dailyLimit, u256(_owners.size()), _owners); bytes args = encodeArgs(u256(0x60), _required, _dailyLimit, u256(_owners.size()), _owners);
sendMessage(*s_compiledWallet + args, true, _value); sendMessage(*s_compiledWallet + args, true, _value);
BOOST_REQUIRE(!m_output.empty()); BOOST_REQUIRE(!m_output.empty());