Replace runtime_error in soltest with ConfigException/assertions where appropriate

Author: cameel

test/Common.cpp

@@ -24,6 +24,7 @@
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <libsolutil/Assertions.h>
+#include <libsolutil/Exceptions.h>
 #include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
@@ -185,8 +186,7 @@ bool CommonOptions::parse(int argc, char const* const* argv)
 		{
 			// Request as uint64_t, since uint8_t will be parsed as character by boost.
 			uint64_t eofVersion = arguments["eof-version"].as<uint64_t>();
-			if (eofVersion != 1)
-				BOOST_THROW_EXCEPTION(std::runtime_error("Invalid EOF version: " + std::to_string(eofVersion)));
+			solRequire(eofVersion == 1, ConfigException, "Invalid EOF version: " + std::to_string(eofVersion));
 			m_eofVersion = 1;
 		}
 
@@ -198,11 +198,7 @@ bool CommonOptions::parse(int argc, char const* const* argv)
 					(parsedOption.original_tokens.size() == 1 && parsedOption.original_tokens.front().empty())
 				)
 					continue; // ignore empty options
-				std::stringstream errorMessage;
-				errorMessage << "Unrecognized option: ";
-				for (auto const& token: parsedOption.original_tokens)
-					errorMessage << token;
-				BOOST_THROW_EXCEPTION(std::runtime_error(errorMessage.str()));
+				solThrow(ConfigException, "Unrecognized option: " + util::joinHumanReadable(parsedOption.original_tokens, ""));
 			}
 	}
 	catch (po::error const& exception)
@@ -262,8 +258,7 @@ langutil::EVMVersion CommonOptions::evmVersion() const
 	if (!m_evmVersionString.empty())
 	{
 		auto version = langutil::EVMVersion::fromString(m_evmVersionString);
-		if (!version)
-			BOOST_THROW_EXCEPTION(std::runtime_error("Invalid EVM version: " + m_evmVersionString));
+		solRequire(version, ConfigException, "Invalid EVM version: " + m_evmVersionString);
 		return *version;
 	}
 	else
@@ -279,7 +274,7 @@ yul::EVMDialect const& CommonOptions::evmDialect() const
 CommonOptions const& CommonOptions::get()
 {
 	if (!m_singleton)
-		BOOST_THROW_EXCEPTION(std::runtime_error("Options not yet constructed!"));
+		soltestAssert(false, "Options not yet constructed!");
 
 	return *m_singleton;
 }

test/Common.h

@@ -76,7 +76,7 @@ struct CommonOptions
 	virtual void addOptions();
 	// @returns true if the program should continue, false if it should exit immediately without
 	// reporting an error.
-	// Throws ConfigException or std::runtime_error if parsing fails.
+	// Throws ConfigException if parsing fails.
 	virtual bool parse(int argc, char const* const* argv);
 	// Throws a ConfigException on error
 	virtual void validate() const;

test/EVMHost.cpp

@@ -29,6 +29,8 @@
 #endif
 
 #include <test/EVMHost.h>
+
+#include <test/Common.h>
 #include <test/libsolidity/util/SoltestErrors.h>
 
 #if defined(__GNUC__) && !defined(__clang__) // GCC-specific pragma
@@ -91,8 +93,7 @@ bool EVMHost::checkVmPaths(std::vector<boost::filesystem::path> const& _vmPaths)
 
 		if (vm.has_capability(EVMC_CAPABILITY_EVM1))
 		{
-			if (evmVmFound)
-				BOOST_THROW_EXCEPTION(std::runtime_error("Multiple evm1 evmc vms defined. Please only define one evm1 evmc vm."));
+			solRequire(!evmVmFound, ConfigException, "Multiple evm1 evmc vms defined. Please only define one evm1 evmc vm.");
 			evmVmFound = true;
 		}
 	}