From 729b47e641c43323671e75c2564788ad47a69903 Mon Sep 17 00:00:00 2001
From: Erik Kundt <erik@ethereum.org>
Date: Fri, 10 Jan 2020 18:13:57 +0100
Subject: [PATCH] Updates semantic tests to 0.7.0.

---
 test/contracts/AuctionRegistrar.cpp            |  2 +-
 test/contracts/FixedFeeRegistrar.cpp           |  2 +-
 test/contracts/Wallet.cpp                      |  2 +-
 test/libsolidity/GasCosts.cpp                  | 18 +++++++++---------
 .../uninitializedFunctionPointer/store2.sol    |  2 +-
 .../libsolidity/semanticTests/viaYul/erc20.sol |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp
index ffe1c3495..4459b3e67 100644
--- a/test/contracts/AuctionRegistrar.cpp
+++ b/test/contracts/AuctionRegistrar.cpp
@@ -42,7 +42,7 @@ namespace
 {
 
 static char const* registrarCode = R"DELIMITER(
-pragma solidity >=0.4.0 <0.7.0;
+pragma solidity >=0.4.0 <0.8.0;
 
 abstract contract NameRegister {
 	function addr(string memory _name) public virtual view returns (address o_owner);
diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp
index acc51c2b9..658f41fbd 100644
--- a/test/contracts/FixedFeeRegistrar.cpp
+++ b/test/contracts/FixedFeeRegistrar.cpp
@@ -53,7 +53,7 @@ static char const* registrarCode = R"DELIMITER(
 // @authors:
 //   Gav Wood <g@ethdev.com>
 
-pragma solidity >=0.4.0 <0.7.0;
+pragma solidity >=0.4.0 <0.8.0;
 
 abstract contract Registrar {
 	event Changed(string indexed name);
diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
index 25b81d4d9..01e07482c 100644
--- a/test/contracts/Wallet.cpp
+++ b/test/contracts/Wallet.cpp
@@ -56,7 +56,7 @@ static char const* walletCode = R"DELIMITER(
 // some number (specified in constructor) of the set of owners (specified in the constructor, modifiable) before the
 // interior is executed.
 
-pragma solidity >=0.4.0 <0.7.0;
+pragma solidity >=0.4.0 <0.8.0;
 
 contract multiowned {
 
diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
index de90c9076..1e1edb7c6 100644
--- a/test/libsolidity/GasCosts.cpp
+++ b/test/libsolidity/GasCosts.cpp
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
 	auto evmVersion = dev::test::Options::get().evmVersion();
 
 	if (evmVersion <= EVMVersion::byzantium())
-		CHECK_DEPLOY_GAS(134209, 130895, evmVersion);
+		CHECK_DEPLOY_GAS(134145, 130831, evmVersion);
 	// This is only correct on >=Constantinople.
 	else if (Options::get().useABIEncoderV2)
 	{
@@ -107,22 +107,22 @@ BOOST_AUTO_TEST_CASE(string_storage)
 		{
 			// Costs with 0 are cases which cannot be triggered in tests.
 			if (evmVersion < EVMVersion::istanbul())
-				CHECK_DEPLOY_GAS(0, 124033, evmVersion);
+				CHECK_DEPLOY_GAS(0, 123969, evmVersion);
 			else
-				CHECK_DEPLOY_GAS(0, 110981, evmVersion);
+				CHECK_DEPLOY_GAS(0, 110969, evmVersion);
 		}
 		else
 		{
 			if (evmVersion < EVMVersion::istanbul())
-				CHECK_DEPLOY_GAS(147835, 131687, evmVersion);
+				CHECK_DEPLOY_GAS(147835, 123969, evmVersion);
 			else
-				CHECK_DEPLOY_GAS(131871, 117231, evmVersion);
+				CHECK_DEPLOY_GAS(131871, 110969, evmVersion);
 		}
 	}
 	else if (evmVersion < EVMVersion::istanbul())
-		CHECK_DEPLOY_GAS(126993, 119723, evmVersion);
+		CHECK_DEPLOY_GAS(126929, 119659, evmVersion);
 	else
-		CHECK_DEPLOY_GAS(114357, 107347, evmVersion);
+		CHECK_DEPLOY_GAS(114345, 107335, evmVersion);
 
 	if (evmVersion >= EVMVersion::byzantium())
 	{
@@ -142,9 +142,9 @@ BOOST_AUTO_TEST_CASE(string_storage)
 			else
 			{
 				if (evmVersion < EVMVersion::istanbul())
-					CHECK_GAS(21707, 21635, 20);
+					CHECK_GAS(21707, 21559, 20);
 				else
-					CHECK_GAS(21499, 21431, 20);
+					CHECK_GAS(21499, 21351, 20);
 			}
 		}
 		else if (evmVersion < EVMVersion::istanbul())
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
index 527ec52c1..835156567 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
@@ -1,4 +1,4 @@
-pragma solidity >=0.5.7 <0.7.0;
+pragma solidity >=0.4.0 <0.8.0;
 
 contract InvalidTest {
 
diff --git a/test/libsolidity/semanticTests/viaYul/erc20.sol b/test/libsolidity/semanticTests/viaYul/erc20.sol
index 6b524e0bf..2ba09521c 100644
--- a/test/libsolidity/semanticTests/viaYul/erc20.sol
+++ b/test/libsolidity/semanticTests/viaYul/erc20.sol
@@ -1,4 +1,4 @@
-pragma solidity >=0.4.0 <0.7.0;
+pragma solidity >=0.4.0 <0.8.0;
 
 contract ERC20 {
     event Transfer(address indexed from, address indexed to, uint256 value);