Rename "enabled" optimizer setting stage to "standard".

This commit is contained in:
chriseth
2019-03-21 11:04:40 +01:00
parent 51ae865b96
commit d381e26fc8
8 changed files with 10 additions and 10 deletions
+1 -1
View File
@@ -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))
{
+1 -1
View File
@@ -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())
+1 -1
View File
@@ -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());
+1 -1
View File
@@ -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);