Merge pull request ethereum#7916 from ethereum/fix-testcase-invalid-e…

…vmversion-handling soltest: Improve handling invalid EVMVersion syntax in test files.
andwat18 · Dec 9, 2019 · d666756 · d666756
2 parents 1fe1459 + 48dd1e3
commit d666756
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
@@ -186,7 +186,7 @@ bool EVMVersionRestrictedTestCase::validateSettings(langutil::EVMVersion _evmVer
 	versionString = versionString.substr(versionBegin);
 	std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(versionString);
 	if (!version)
-		throw runtime_error("Invalid EVM version: \"" + versionString + "\"");
+		BOOST_THROW_EXCEPTION(runtime_error{"Invalid EVM version: \"" + versionString + "\""});
 
 	if (comparator == ">")
 		return _evmVersion > version;
@@ -201,6 +201,5 @@ bool EVMVersionRestrictedTestCase::validateSettings(langutil::EVMVersion _evmVer
 	else if (comparator == "!")
 		return !(_evmVersion == version);
 	else
-		throw runtime_error("Invalid EVM comparator: \"" + comparator + "\"");
-	return false; // not reached
+		BOOST_THROW_EXCEPTION(runtime_error{"Invalid EVM comparator: \"" + comparator + "\""});
 }