mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Rename "enabled" optimizer setting stage to "standard".
This commit is contained in:
@@ -57,7 +57,7 @@ ExecutionFramework::ExecutionFramework():
|
||||
ExecutionFramework::ExecutionFramework(string const& _ipcPath, langutil::EVMVersion _evmVersion):
|
||||
m_rpc(RPCSession::instance(_ipcPath)),
|
||||
m_evmVersion(_evmVersion),
|
||||
m_optimiserSettings(dev::test::Options::get().optimize ? solidity::OptimiserSettings::enabled() : solidity::OptimiserSettings::minimal()),
|
||||
m_optimiserSettings(dev::test::Options::get().optimize ? solidity::OptimiserSettings::standard() : solidity::OptimiserSettings::minimal()),
|
||||
m_showMessages(dev::test::Options::get().showMessages),
|
||||
m_sender(m_rpc.account(0))
|
||||
{
|
||||
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
bytes bytecode = lll::compileLLL(
|
||||
_sourceCode,
|
||||
dev::test::Options::get().evmVersion(),
|
||||
m_optimiserSettings == solidity::OptimiserSettings::enabled(),
|
||||
m_optimiserSettings == solidity::OptimiserSettings::standard(),
|
||||
&errors
|
||||
);
|
||||
if (!errors.empty())
|
||||
|
||||
@@ -86,7 +86,7 @@ eth::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
|
||||
{
|
||||
Compiler compiler(
|
||||
dev::test::Options::get().evmVersion(),
|
||||
dev::test::Options::get().optimize ? OptimiserSettings::enabled() : OptimiserSettings::minimal()
|
||||
dev::test::Options::get().optimize ? OptimiserSettings::standard() : OptimiserSettings::minimal()
|
||||
);
|
||||
compiler.compileContract(*contract, map<ContractDefinition const*, shared_ptr<Compiler const>>{}, bytes());
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
{
|
||||
OptimiserSettings previousSettings = std::move(m_optimiserSettings);
|
||||
// This uses "none" / "full" while most other test frameworks use
|
||||
// "minimal" / "enabled".
|
||||
// "minimal" / "standard".
|
||||
m_optimiserSettings = _optimize ? OptimiserSettings::full() : OptimiserSettings::none();
|
||||
m_optimiserSettings.expectedExecutionsPerDeployment = _optimizeRuns;
|
||||
bytes const& ret = compileAndRun(_sourceCode, _value, _contractName);
|
||||
|
||||
Reference in New Issue
Block a user