From eb2425bd7c14db2d98ca06a50586ecc8093b0652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Wed, 27 Oct 2021 18:02:26 +0200 Subject: [PATCH 1/2] isoltest: Fix gas tests always being enforced regardless of evm version --- test/tools/IsolTestOptions.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/tools/IsolTestOptions.cpp b/test/tools/IsolTestOptions.cpp index 7f00e88f6..d2323ec16 100644 --- a/test/tools/IsolTestOptions.cpp +++ b/test/tools/IsolTestOptions.cpp @@ -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{}); + return res; } From a0394316274b9811be7d3c98c0ce687dfcb10e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Wed, 27 Oct 2021 18:20:04 +0200 Subject: [PATCH 2/2] isoltest: Do not try to enforce gas costs when ABIEncoderV1 is used --- test/tools/IsolTestOptions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tools/IsolTestOptions.cpp b/test/tools/IsolTestOptions.cpp index d2323ec16..cdd1b85ab 100644 --- a/test/tools/IsolTestOptions.cpp +++ b/test/tools/IsolTestOptions.cpp @@ -83,7 +83,7 @@ bool IsolTestOptions::parse(int _argc, char const* const* _argv) return false; } - enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{}); + enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{} && !useABIEncoderV1); return res; }