Merge pull request #12207 from ethereum/fix-isoltest-enforce-gas-default

Fix defaults for `--enforce-gas-cost` in isoltest
This commit is contained in:
chriseth 2021-10-27 23:10:14 +02:00 committed by GitHub
commit cede36930d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -60,7 +60,6 @@ IsolTestOptions::IsolTestOptions():
CommonOptions(description)
{
enforceViaYul = true;
enforceGasTest = (evmVersion() == langutil::EVMVersion{});
}
void IsolTestOptions::addOptions()
@ -84,6 +83,8 @@ bool IsolTestOptions::parse(int _argc, char const* const* _argv)
return false;
}
enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{} && !useABIEncoderV1);
return res;
}