Merge pull request #11397 from ethereum/v1-test-cleanup

Cleanup ABICoder V1 tests

test/libsolidity/semanticTests/abiEncoderV1/abi_encode_empty_string.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     function f1() public returns (bytes memory) {
         return abi.encode("");

test/libsolidity/semanticTests/abiEncoderV1/bool_out_of_bounds.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
 	function f(bool b) public pure returns (bool) { return b; }
 }

test/libsolidity/semanticTests/abiEncoderV1/cleanup/cleanup.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     function f(uint16 a, int16 b, address c, bytes3 d, bool e)
             public pure returns (uint v, uint w, uint x, uint y, uint z) {

test/libsolidity/semanticTests/abiEncoderV1/enums.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     enum E { A, B }
     function f(E e) public pure returns (uint x) {

test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol

@@ -1,5 +1,5 @@
 ==== Source: A ====
-pragma abicoder               v2;
+pragma abicoder v2;
 
 struct Data {
     uint a;
@@ -19,6 +19,8 @@ contract B {
     }
 }
 ==== Source: B ====
+pragma abicoder v1;
+
 import "A";
 
 contract C is B {
@@ -31,5 +33,5 @@ contract C is B {
 // ----
 // test() -> 77
 // gas irOptimized: 133635
-// gas legacy: 156573
-// gas legacyOptimized: 112940
+// gas legacy: 156449
+// gas legacyOptimized: 112943

test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol

@@ -1,5 +1,5 @@
 ==== Source: A ====
-pragma abicoder               v2;
+pragma abicoder v2;
 
 struct Data {
     uint value;
@@ -23,6 +23,8 @@ contract B {
     }
 }
 ==== Source: B ====
+pragma abicoder v1;
+
 import "A";
 
 contract C is B {
@@ -39,4 +41,4 @@ contract C is B {
 // ----
 // test() -> 5, 10
 // gas irOptimized: 92624
-// gas legacy: 100441
+// gas legacy: 100237

test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 // Tests that this will not end up using a "bytes0" type
 // (which would assert)
 contract C {

test/libsolidity/semanticTests/arithmetics/checked_add_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     // Input is still not checked - this needs ABIEncoderV2!
     function f(uint16 a, uint16 b) public returns (uint16) {

test/libsolidity/semanticTests/cleanup/bool_conversion_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     function f(bool _b) public returns (uint256) {
         if (_b) return 1;

test/libsolidity/semanticTests/cleanup/cleanup_address_types_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 // Checks that address types are properly cleaned before they are compared.
 contract C {
     function f(address a) public returns (uint256) {

test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 // Checks that bytesXX types are properly cleaned before they are compared.
 contract C {
     function f(bytes2 a, uint16 x) public returns (uint256) {

test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     function f(int8 a, uint8 b) public returns (int256) {
         assembly {

test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     function f(uint8 a, uint8 b) public returns (uint256) {
         assembly {

test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     function f(int16 a, uint16 b) public returns (int16) {
         return a >> b;

test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     function f(int32 a, uint32 b) public returns (int32) {
         return a >> b;

test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
     function f(int8 a, uint8 b) public returns (int8) {
         return a >> b;

test/libsolidity/semanticTests/revertStrings/calldata_too_short_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
 	function d(bytes memory _data) public pure returns (uint8) {
 		return abi.decode(_data, (uint8));

test/libsolidity/semanticTests/revertStrings/enum_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
 	enum E {X, Y}
 	function f(E[] calldata arr) external {

test/libsolidity/semanticTests/revertStrings/enum_v2.sol

@@ -0,0 +1,13 @@
+pragma abicoder v2;
+contract C {
+	enum E {X, Y}
+	function f(E[] calldata arr) external {
+		arr[1];
+	}
+}
+// ====
+// EVMVersion: >=byzantium
+// compileViaYul: also
+// revertStrings: debug
+// ----
+// f(uint8[]): 0x20, 2, 3, 3 -> FAILURE

test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol

@@ -4,6 +4,7 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
+// ABIEncoderV1Only: true
 // compileViaYul: false
 // revertStrings: debug
 // ----

test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1_abiv2.sol

@@ -1,10 +0,0 @@
-pragma abicoder v2;
-contract C {
-    function t(uint) public pure {}
-}
-// ====
-// EVMVersion: >=byzantium
-// compileViaYul: also
-// revertStrings: debug
-// ----
-// t(uint256) -> FAILURE, hex"08c379a0", 0x20, 34, "ABI decoding: tuple data too sho", "rt"

test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol

@@ -1,9 +1,10 @@
+pragma abicoder v2;
 contract C {
     function t(uint) public pure {}
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: true
+// compileViaYul: also
 // revertStrings: debug
 // ----
 // t(uint256) -> FAILURE, hex"08c379a0", 0x20, 34, "ABI decoding: tuple data too sho", "rt"

test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_calldata_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
 	function d(bytes memory _data) public pure returns (uint8) {
 		return abi.decode(_data, (uint8));

test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_memory_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract C {
 	function dyn(uint ptr, uint start, uint x) public returns (bytes memory a) {
 		assembly {

test/libsolidity/semanticTests/types/mapping_enum_key_getter_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 contract test {
     enum E { A, B, C }
     mapping(E => uint8) public table;

test/libsolidity/semanticTests/types/mapping_enum_key_library_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 enum E { A, B, C }
 library L {
     function get(mapping(E => uint8) storage table, E k) external returns (uint8) {

test/libsolidity/semanticTests/types/mapping_enum_key_v1.sol

@@ -1,3 +1,4 @@
+pragma abicoder v1;
 enum E { A, B, C }
 contract test {
     mapping(E => uint8) table;