Change assertion type in GasMeter.

Author: ekpyron

libevmasm/GasMeter.cpp

@@ -298,7 +298,7 @@ unsigned GasMeter::runGas(Instruction _instruction, langutil::EVMVersion _evmVer
 
 	if (auto gasCost = gasCostForTier(instructionInfo(_instruction, _evmVersion).gasPriceTier))
 		return *gasCost;
-	assertThrow(false, OptimizerException, "Invalid gas tier for instruction " + instructionInfo(_instruction, _evmVersion).name);
+	solAssert(false, "Invalid gas tier for instruction " + instructionInfo(_instruction, _evmVersion).name);
 }
 
 unsigned GasMeter::pushGas(u256 _value, langutil::EVMVersion _evmVersion)
@@ -314,7 +314,7 @@ unsigned GasMeter::swapGas(size_t _depth, langutil::EVMVersion _evmVersion)
 	if (_depth <= 16)
 		return runGas(evmasm::swapInstruction(static_cast<unsigned>(_depth)), _evmVersion);
 	auto gasCost = gasCostForTier(instructionInfo(evmasm::Instruction::SWAPN, _evmVersion).gasPriceTier);
-	assertThrow(gasCost.has_value(), OptimizerException, "Expected gas cost for SWAPN to be defined.");
+	solAssert(gasCost.has_value(), "Expected gas cost for SWAPN to be defined.");
 	return *gasCost;
 }
 
@@ -323,7 +323,7 @@ unsigned GasMeter::dupGas(size_t _depth, langutil::EVMVersion _evmVersion)
 	if (_depth <= 16)
 		return runGas(evmasm::swapInstruction(static_cast<unsigned>(_depth)), _evmVersion);
 	auto gasCost = gasCostForTier(instructionInfo(evmasm::Instruction::DUPN, _evmVersion).gasPriceTier);
-	assertThrow(gasCost.has_value(), OptimizerException, "Expected gas cost for DUPN to be defined.");
+	solAssert(gasCost.has_value(), "Expected gas cost for DUPN to be defined.");
 	return *gasCost;
 }
 
@@ -337,14 +337,14 @@ u256 GasMeter::dataGas(bytes const& _data, bool _inCreation, langutil::EVMVersio
 	}
 	else
 		gas = bigint(GasCosts::createDataGas) * _data.size();
-	assertThrow(gas < bigint(u256(-1)), OptimizerException, "Gas cost exceeds 256 bits.");
+	solAssert(gas < bigint(u256(-1)), "Gas cost exceeds 256 bits.");
 	return u256(gas);
 }
 
 
 u256 GasMeter::dataGas(uint64_t _length, bool _inCreation, langutil::EVMVersion _evmVersion)
 {
 	bigint gas = bigint(_length) * (_inCreation ? GasCosts::txDataNonZeroGas(_evmVersion) : GasCosts::createDataGas);
-	assertThrow(gas < bigint(u256(-1)), OptimizerException, "Gas cost exceeds 256 bits.");
+	solAssert(gas < bigint(u256(-1)), "Gas cost exceeds 256 bits.");
 	return u256(gas);
 }