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

chriseth · web-flow · commit cede36930db6 · 2021-10-27T23:10:14.000+02:00
Fix defaults for `--enforce-gas-cost` in isoltest
diff --git 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{} && !useABIEncoderV1);
+
 	return res;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ IsolTestOptions::IsolTestOptions():`
`60`	`60`	`CommonOptions(description)`
`61`	`61`	`{`
`62`	`62`	`enforceViaYul = true;`
`63`		`- enforceGasTest = (evmVersion() == langutil::EVMVersion{});`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`void IsolTestOptions::addOptions()`
`@@ -84,6 +83,8 @@ bool IsolTestOptions::parse(int _argc, char const* const* _argv)`
`84`	`83`	`return false;`
`85`	`84`	`}`
`86`	`85`
	`86`	`+ enforceGasTest = enforceGasTest \|\| (evmVersion() == langutil::EVMVersion{} && !useABIEncoderV1);`
	`87`	`+`
`87`	`88`	`return res;`
`88`	`89`	`}`
`89`	`90`