eof: Update semantic tests - removing address from test expectation

rodiazet · rodiazet · commit d07a2ffbb177 · 2025-01-27T13:52:10.000+01:00
diff --git a/test/libsolidity/semanticTests/builtinFunctions/eof/keccak256_packed_complex_types.sol b/test/libsolidity/semanticTests/builtinFunctions/eof/keccak256_packed_complex_types.sol
@@ -1,17 +1,17 @@
 contract C {
     uint120[3] x;
-    function f() public returns (bytes32 hash1, bytes32 hash2, bytes32 hash3) {
+    function f() public returns (bytes32 hash1, bytes32 hash2, bool hash3NonZero) {
         uint120[] memory y = new uint120[](3);
         x[0] = y[0] = uint120(type(uint).max - 1);
         x[1] = y[1] = uint120(type(uint).max - 2);
         x[2] = y[2] = uint120(type(uint).max - 3);
         hash1 = keccak256(abi.encodePacked(x));
         hash2 = keccak256(abi.encodePacked(y));
-        hash3 = keccak256(abi.encodePacked(this.f));
+        hash3NonZero = bytes32(0) != keccak256(abi.encodePacked(this.f));
     }
 }
 // ====
 // EVMVersion: >=prague
 // bytecodeFormat: >=EOFv1
 // ----
-// f() -> 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0x8a1a644bc732d428df88d4952d1be96a9217ec31fdec3f55bae4059f936e955d
+// f() -> 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, true
diff --git a/test/libsolidity/semanticTests/errors/eof/errors_by_parameter_type.sol b/test/libsolidity/semanticTests/errors/eof/errors_by_parameter_type.sol
@@ -27,10 +27,10 @@ contract C {
         require(false, E3(S(1, true, "string literal")));
     }
     function e() external view {
-        require(false, E4(address(this)));
+        require(false, E4(address(0x6AfCA7D4Df015A0Ba25dA0d02D175603a5fB40E6)));
     }
-    function f() external view {
-        require(false, E5(this.a));
+    function f(function() external pure x) external view {
+        require(false, E5(x));
     }
 }
 
@@ -43,4 +43,4 @@ contract C {
 // c() -> FAILURE, hex"8f372c34", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000e", hex"737472696e67206c69746572616c000000000000000000000000000000000000"
 // d() -> FAILURE, hex"5717173e", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"000000000000000000000000000000000000000000000000000000000000000e", hex"737472696e67206c69746572616c000000000000000000000000000000000000"
 // e() -> FAILURE, hex"7efef9ea", hex"0000000000000000000000006afca7d4df015a0ba25da0d02d175603a5fb40e6"
-// f() -> FAILURE, hex"0c3f12eb", hex"6afca7d4df015a0ba25da0d02d175603a5fb40e60dbe671f0000000000000000"
+// f(function): left(0x6afca7d4df015a0ba25da0d02d175603a5fb40e60dbe671f0000000000000000) -> FAILURE, hex"0c3f12eb", hex"6afca7d4df015a0ba25da0d02d175603a5fb40e60dbe671f0000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/eof/require_error_function_pointer_parameter.sol b/test/libsolidity/semanticTests/errors/eof/require_error_function_pointer_parameter.sol
@@ -2,20 +2,15 @@ error CustomError(function(uint256) external pure returns (uint256));
 
 contract C
 {
-    function e(uint256 x) external pure returns (uint256)
-    {
-        return x;
-    }
-
-    function f() external view
+    function f(function(uint256) external pure returns (uint256) x) external view
     {
         // more than one stack slot
-        require(false, CustomError(this.e));
+        require(false, CustomError(x));
     }
 }
 
 // ====
 // EVMVersion: >=prague
 // bytecodeFormat: >=EOFv1
 // ----
-// f() -> FAILURE, hex"271b1dfa", hex"a4dc3b5fce39438ce512c732ccb22e3212856bb6f37cdc8e0000000000000000"
+// f(function): left(0xa4dc3b5fce39438ce512c732ccb22e3212856bb6f37cdc8e0000000000000000) -> FAILURE, hex"271b1dfa", hex"a4dc3b5fce39438ce512c732ccb22e3212856bb6f37cdc8e0000000000000000"
diff --git a/test/libsolidity/semanticTests/events/eof/event_indexed_function.sol b/test/libsolidity/semanticTests/events/eof/event_indexed_function.sol
@@ -1,12 +1,12 @@
 contract C {
     event Test(function() external indexed);
-    function f() public {
-        emit Test(this.f);
+    function f(function() external x) public {
+        emit Test(x);
     }
 }
 // ====
 // EVMVersion: >=prague
 // bytecodeFormat: >=EOFv1
 // ----
-// f() ->
+// f(function): left(0x8f8cc95dcbe7358c1cf1409d3a7ad079e89576bb26121ff00000000000000000) ->
 // ~ emit Test(function): #0x8f8cc95dcbe7358c1cf1409d3a7ad079e89576bb26121ff00000000000000000
diff --git a/test/libsolidity/semanticTests/events/eof/event_indexed_function2.sol b/test/libsolidity/semanticTests/events/eof/event_indexed_function2.sol
@@ -1,18 +1,18 @@
 contract C {
     event TestA(function() external indexed);
     event TestB(function(uint256) external indexed);
-    function f1() public {
-        emit TestA(this.f1);
+    function f1(function() external x) public {
+        emit TestA(x);
     }
-    function f2(uint256 a) public {
-        emit TestB(this.f2);
+    function f2(function(uint256) external x) public {
+        emit TestB(x);
     }
 }
 // ====
 // EVMVersion: >=prague
 // bytecodeFormat: >=EOFv1
 // ----
-// f1() ->
+// f1(function): left(0x347eaa94e3f63220b1f27af5888d33325ddbd4dec27fc3050000000000000000) ->
 // ~ emit TestA(function): #0x347eaa94e3f63220b1f27af5888d33325ddbd4dec27fc3050000000000000000
-// f2(uint256): 1 ->
+// f2(function): left(0x347eaa94e3f63220b1f27af5888d33325ddbd4debf3724af0000000000000000) ->
 // ~ emit TestB(function): #0x347eaa94e3f63220b1f27af5888d33325ddbd4debf3724af0000000000000000
diff --git a/test/libsolidity/semanticTests/functionCall/eof/failed_create.sol b/test/libsolidity/semanticTests/functionCall/eof/failed_create.sol
@@ -2,15 +2,15 @@ contract D { constructor() payable {} }
 contract C {
 	uint public x;
 	constructor() payable {}
-	function f(uint amount) public returns (D) {
+	function f(uint amount) public returns (bool) {
 		x++;
-		return (new D){value: amount, salt: bytes32(x)}();
+		return address((new D){value: amount, salt: bytes32(x)}()) != address(0);
 	}
-	function stack(uint depth) public payable returns (address) {
+	function stack(uint depth) public payable returns (bool) {
 		if (depth > 0)
 			return this.stack(depth - 1);
 		else
-			return address(f(0));
+			return f(0);
 	}
 }
 // ====
@@ -24,7 +24,7 @@ contract C {
 // gas legacy code: 215400
 // gas legacyOptimized: 61715
 // gas legacyOptimized code: 106800
-// f(uint256): 20 -> 0x9d73add92c0d464f534262259cf6914e28caceaa
+// f(uint256): 20 -> true
 // x() -> 1
 // f(uint256): 20 -> FAILURE
 // x() -> 1
@@ -33,5 +33,5 @@ contract C {
 // gas legacy: 477722
 // gas legacyOptimized: 299567
 // x() -> 1
-// stack(uint256): 10 -> 0xb2c409d23d8105ff2553a318f2f73f47c80c7701
+// stack(uint256): 10 -> true
 // x() -> 2
diff --git a/test/libsolidity/semanticTests/functionTypes/eof/address_member.sol b/test/libsolidity/semanticTests/functionTypes/eof/address_member.sol
@@ -5,9 +5,16 @@ contract C {
         [this.f.address][0];
         a2 = [this.f.address][0];
     }
+
+    function checkAddress() public returns (bool) {
+        address a1;
+        address a2;
+        (a1, a2) = f();
+        return (a1 != address(0) && a1 == a2);
+    }
 }
 // ====
 // EVMVersion: >=prague
 // bytecodeFormat: >=EOFv1
 // ----
-// f() -> 0xc19c03f456eb6e9b1d3e41daa69053e44bdbd949, 0xc19c03f456eb6e9b1d3e41daa69053e44bdbd949
+// checkAddress() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/eof/function_external_delete_storage.sol b/test/libsolidity/semanticTests/functionTypes/eof/function_external_delete_storage.sol
@@ -28,7 +28,6 @@ contract C {
 // increment() ->
 // y() -> 1
 // set() ->
-// x() -> 0xfc0c3cc95d8d080a1f9ff0a9474a22423d046267d09de08a0000000000000000
 // increment() ->
 // y() -> 2
 // incrementIndirectly() ->
diff --git a/test/libsolidity/semanticTests/inlineAssembly/eof/external_function_pointer_address.sol b/test/libsolidity/semanticTests/inlineAssembly/eof/external_function_pointer_address.sol
@@ -1,20 +1,25 @@
 contract C {
 	function testFunction() external {}
-
-	function testYul() public returns (address adr) {
+	address contractAddress = address(this);
+	function testYul() public returns (bool) {
+		require(contractAddress != address(0));
 		function() external fp = this.testFunction;
 
+		address adr;
 		assembly {
 			adr := fp.address
 		}
+
+		return adr == contractAddress;
 	}
-	function testSol() public returns (address) {
-		return this.testFunction.address;
+	function testSol() public returns (bool) {
+		require(contractAddress != address(0));
+		return this.testFunction.address == contractAddress;
 	}
 }
 // ====
 // EVMVersion: >=prague
 // bytecodeFormat: >=EOFv1
 // ----
-// testYul() -> 0x0b4a2e943bbeb51ee55e5785a597202569667e7b
-// testSol() -> 0x0b4a2e943bbeb51ee55e5785a597202569667e7b
+// testYul() -> true
+// testSol() -> true
diff --git a/test/libsolidity/semanticTests/isoltestTesting/eof/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/eof/balance_other_contract.sol
@@ -13,6 +13,9 @@ contract ClientReceipt {
     function getAddress() public returns (address) {
         return other.getAddress();
     }
+    function checkBalance() public returns (bool) {
+        return getAddress().balance == 500;
+    }
 }
 // ====
 // bytecodeFormat: >=EOFv1
@@ -29,5 +32,4 @@ contract ClientReceipt {
 // gas irOptimized: 191881
 // gas legacy: 235167
 // gas legacyOptimized: 180756
-// getAddress() -> 0x50485c9a7aea973bd309d1bac29c57eeea7e155e
-// balance: 0x50485c9a7aea973bd309d1bac29c57eeea7e155e -> 500
+// checkBalance() -> true
diff --git a/test/libsolidity/semanticTests/tryCatch/eof/create.sol b/test/libsolidity/semanticTests/tryCatch/eof/create.sol
@@ -15,20 +15,19 @@ contract C {
             txt = s;
         }
     }
-    function g() public returns (Succeeds x, uint, string memory txt) {
+    function g() public returns (bool x, uint, string memory txt) {
         uint i = 8;
         try new Succeeds(i) returns (Succeeds r) {
-            x = r;
+            x = address(r) != address(0);
             txt = "success";
         } catch Error(string memory s) {
             txt = s;
         }
     }
 }
 // ====
-// EVMVersion: >=byzantium
-// bytecodeFormat: >=EOFv1
 // EVMVersion: >=prague
+// bytecodeFormat: >=EOFv1
 // ----
 // f() -> 0, 0, 96, 13, "test message."
-// g() -> 0x79E227549940F29566EB81846A858E6F4108C430, 0, 96, 7, "success"
+// g() -> true, 0, 0x60, 7, "success"
diff --git a/test/libsolidity/semanticTests/tryCatch/eof/return_function.sol b/test/libsolidity/semanticTests/tryCatch/eof/return_function.sol
@@ -4,10 +4,10 @@ contract C {
         h = this.fun;
         b = 9;
     }
-    function f() public returns (uint, function() external, uint) {
+    function f() public returns (uint, bool, uint) {
         // Note that the function type uses two stack slots.
         try this.g() returns (uint a, function() external h, uint b) {
-            return (a, h, b);
+            return (a, h == this.fun, b);
         } catch {
         }
     }
@@ -17,4 +17,4 @@ contract C {
 // EVMVersion: >=prague
 // bytecodeFormat: >=EOFv1
 // ----
-// f() -> 0x1, 0x9af5ffe522062ee0c1ed0c96288c657f99645bb7946644cd0000000000000000, 9
+// f() -> 1, true, 9
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/eof/function_cast.sol b/test/libsolidity/semanticTests/viaYul/conversion/eof/function_cast.sol
@@ -8,11 +8,11 @@ contract C {
 	function h(uint x) public returns (uint) {
 		return this.g()(x) + 1;
 	}
-	function t() external view returns (
+	function t(function(uint) external returns (uint) x, function(uint) external view returns (uint) y) external view returns (
 			function(uint) external returns (uint) a,
 			function(uint) external view returns (uint) b) {
-		a = this.f;
-		b = this.f;
+		a = x;
+		b = y;
 	}
 }
 // ====
@@ -21,4 +21,4 @@ contract C {
 // ----
 // f(uint256): 2 -> 4
 // h(uint256): 2 -> 5
-// t() -> 0x51ac6a341cdab4263623cddef6e4860d0679b0a9b3de648b0000000000000000, 0x51ac6a341cdab4263623cddef6e4860d0679b0a9b3de648b0000000000000000
+// t(function, function): left(0x51ac6a341cdab4263623cddef6e4860d0679b0a9b3de648b0000000000000000), left(0x51ac6a341cdab4263623cddef6e4860d0679b0a9b3de648b0000000000000000) -> 0x51ac6a341cdab4263623cddef6e4860d0679b0a9b3de648b0000000000000000, 0x51ac6a341cdab4263623cddef6e4860d0679b0a9b3de648b0000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/eof/function_address.sol b/test/libsolidity/semanticTests/viaYul/eof/function_address.sol
@@ -1,6 +1,6 @@
 contract C {
-    function f() external returns (address) {
-        return this.f.address;
+    function f() external returns (bool) {
+        return this.f.address != address(0);
     }
     function g() external returns (bool) {
       return this.f.address == address(this);
@@ -13,6 +13,6 @@ contract C {
 // EVMVersion: >=prague
 // bytecodeFormat: >=EOFv1
 // ----
-// f() -> 0xb3549131064ca5e21e50c0344a84a43c5d8f5b4b
+// f() -> true
 // g() -> true
 // h(function): left(0x1122334400112233445566778899AABBCCDDEEFF42424242) -> 0x1122334400112233445566778899AABBCCDDEEFF

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@ contract C {`
`27`	`27`	`require(false, E3(S(1, true, "string literal")));`
`28`	`28`	`}`
`29`	`29`	`function e() external view {`
`30`		`- require(false, E4(address(this)));`
	`30`	`+ require(false, E4(address(0x6AfCA7D4Df015A0Ba25dA0d02D175603a5fB40E6)));`
`31`	`31`	`}`
`32`		`- function f() external view {`
`33`		`- require(false, E5(this.a));`
	`32`	`+ function f(function() external pure x) external view {`
	`33`	`+ require(false, E5(x));`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`@@ -43,4 +43,4 @@ contract C {`
`43`	`43`	`// c() -> FAILURE, hex"8f372c34", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000e", hex"737472696e67206c69746572616c000000000000000000000000000000000000"`
`44`	`44`	`// d() -> FAILURE, hex"5717173e", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"000000000000000000000000000000000000000000000000000000000000000e", hex"737472696e67206c69746572616c000000000000000000000000000000000000"`
`45`	`45`	`// e() -> FAILURE, hex"7efef9ea", hex"0000000000000000000000006afca7d4df015a0ba25da0d02d175603a5fb40e6"`
`46`		`-// f() -> FAILURE, hex"0c3f12eb", hex"6afca7d4df015a0ba25da0d02d175603a5fb40e60dbe671f0000000000000000"`
	`46`	`+// f(function): left(0x6afca7d4df015a0ba25da0d02d175603a5fb40e60dbe671f0000000000000000) -> FAILURE, hex"0c3f12eb", hex"6afca7d4df015a0ba25da0d02d175603a5fb40e60dbe671f0000000000000000"`
Original file line number	Diff line number	Diff line change
`@@ -2,20 +2,15 @@ error CustomError(function(uint256) external pure returns (uint256));`
`2`	`2`
`3`	`3`	`contract C`
`4`	`4`	`{`
`5`		`- function e(uint256 x) external pure returns (uint256)`
`6`		`- {`
`7`		`- return x;`
`8`		`- }`
`9`		`-`
`10`		`- function f() external view`
	`5`	`+ function f(function(uint256) external pure returns (uint256) x) external view`
`11`	`6`	`{`
`12`	`7`	`// more than one stack slot`
`13`		`- require(false, CustomError(this.e));`
	`8`	`+ require(false, CustomError(x));`
`14`	`9`	`}`
`15`	`10`	`}`
`16`	`11`
`17`	`12`	`// ====`
`18`	`13`	`// EVMVersion: >=prague`
`19`	`14`	`// bytecodeFormat: >=EOFv1`
`20`	`15`	`// ----`
`21`		`-// f() -> FAILURE, hex"271b1dfa", hex"a4dc3b5fce39438ce512c732ccb22e3212856bb6f37cdc8e0000000000000000"`
	`16`	`+// f(function): left(0xa4dc3b5fce39438ce512c732ccb22e3212856bb6f37cdc8e0000000000000000) -> FAILURE, hex"271b1dfa", hex"a4dc3b5fce39438ce512c732ccb22e3212856bb6f37cdc8e0000000000000000"`