refactor: update result comparison method and test case

LouisTsai-Csie · LouisTsai-Csie · commit ec3934199477 · 2025-08-12T15:47:58.000+08:00
diff --git a/tests/osaka/eip7883_modexp_gas_increase/conftest.py b/tests/osaka/eip7883_modexp_gas_increase/conftest.py
@@ -5,7 +5,7 @@
 import pytest
 
 from ethereum_test_forks import Fork, Osaka
-from ethereum_test_tools import Account, Address, Alloc, Storage, Transaction
+from ethereum_test_tools import Account, Address, Alloc, Bytes, Storage, Transaction, keccak256
 from ethereum_test_tools.vm.opcode import Opcodes as Op
 
 from ...byzantium.eip198_modexp_precompile.helpers import ModExpInput
@@ -109,17 +109,11 @@ def gas_measure_contract(
 
     if call_succeeds:
         code += Op.SSTORE(call_contract_post_storage.store_next(precompile_gas), gas_calculation)
-        # + Op.RETURNDATACOPY(dest_offset=0, offset=0, size=Op.RETURNDATASIZE())
-        # + Op.SSTORE(call_contract_post_storage.store_next(
-        #     keccak256(Bytes(vector.expected))), Op.SHA3(0, Op.RETURNDATASIZE()))
-
-        for i in range(len(modexp_expected) // 32):
-            code += Op.RETURNDATACOPY(0, i * 32, 32)
-            code += Op.SSTORE(
-                call_contract_post_storage.store_next(modexp_expected[i * 32 : (i + 1) * 32]),
-                Op.MLOAD(0),
-            )
-
+        code += Op.RETURNDATACOPY(dest_offset=0, offset=0, size=Op.RETURNDATASIZE())
+        code += Op.SSTORE(
+            call_contract_post_storage.store_next(keccak256(Bytes(modexp_expected))),
+            Op.SHA3(0, Op.RETURNDATASIZE()),
+        )
     return pre.deploy_contract(code)
 
 
diff --git a/tests/osaka/eip7883_modexp_gas_increase/vector/legacy.json b/tests/osaka/eip7883_modexp_gas_increase/vector/legacy.json
@@ -76,7 +76,7 @@
     },
     {
         "Input": "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",
-        "Expected": "0200",
+        "Expected": "0002",
         "Name": "legacy-case-16"
     },
     {
@@ -131,32 +131,32 @@
     },
     {
         "Input": "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
-        "Expected": "0200",
+        "Expected": "0002",
         "Name": "legacy-case-27"
     },
     {
         "Input": "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",
-        "Expected": "01000000000000000000000000000000",
+        "Expected": "00000000000000000000000000000001",
         "Name": "legacy-case-31"
     },
     {
         "Input": "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
-        "Expected": "010000000000000000000000",
+        "Expected": "000000000000000000000001",
         "Name": "legacy-case-32"
     },
     {
         "Input": "0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
-        "Expected": "010000000000",
+        "Expected": "000000000001",
         "Name": "legacy-case-33"
     },
     {
         "Input": "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
-        "Expected": "01000000000000000000000000",
+        "Expected": "00000000000000000000000001",
         "Name": "legacy-case-34"
     },
     {
         "Input": "0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
-        "Expected": "000000010000000000000000000000000000",
+        "Expected": "000000000000000000000000000000000001",
         "Name": "legacy-case-35"
     }
 ]
diff --git a/tests/osaka/eip7883_modexp_gas_increase/vector/vectors.json b/tests/osaka/eip7883_modexp_gas_increase/vector/vectors.json
@@ -1,7 +1,7 @@
 [
     {
-        "Input": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",
-        "Expected": "000000000000000000000000000000000000000000000000000000000000000000",
+        "Input": "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",
+        "Expected": "000000000000000000000000000000000000000000000000000000000000000001",
         "Name": "geth-fail-length",
         "GasOld": 200,
         "GasNew": 1600
@@ -141,7 +141,7 @@
     },
     {
         "Input": "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000181000000000000000000000000000000000000000000000000000000000000000801ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2cffffffffffffffffffffffffffffffffffffffffffffffffffffffff3b10000000006c01ffffffffffffffffffffffffffffffffffffffffffffffdffffb97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3bffffffffffffffffffffffffffffffffffffffffffffffffffffffffebafd93b37ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc5bb6affffffff3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2a",
-        "Expected": "0001000000000000",
+        "Expected": "0000000000000001",
         "Name": "guido-4-even",
         "GasOld": 1026,
         "GasNew": 94448

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@`
`76`	`76`	`},`
`77`	`77`	`{`
`78`	`78`	`"Input": "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000202030006",`
`79`		`- "Expected": "0200",`
	`79`	`+ "Expected": "0002",`
`80`	`80`	`"Name": "legacy-case-16"`
`81`	`81`	`},`
`82`	`82`	`{`
`@@ -131,32 +131,32 @@`
`131`	`131`	`},`
`132`	`132`	`{`
`133`	`133`	"Input": "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000010100000000000000000000000000000000000000000000000000000000000000020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030006",
`134`		`- "Expected": "0200",`
	`134`	`+ "Expected": "0002",`
`135`	`135`	`"Name": "legacy-case-27"`
`136`	`136`	`},`
`137`	`137`	`{`
`138`	`138`	`"Input": "000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010035ee4e488f45e64d2f07becd54646357381d32f30b74c299a8c25d5202c04938ef6c4764a04f10fc908b78c4486886000f6d290251a79681a83b950c7e5c37351",`
`139`		`- "Expected": "01000000000000000000000000000000",`
	`139`	`+ "Expected": "00000000000000000000000000000001",`
`140`	`140`	`"Name": "legacy-case-31"`
`141`	`141`	`},`
`142`	`142`	`{`
`143`	`143`	`"Input": "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",`
`144`		`- "Expected": "010000000000000000000000",`
	`144`	`+ "Expected": "000000000000000000000001",`
`145`	`145`	`"Name": "legacy-case-32"`
`146`	`146`	`},`
`147`	`147`	`{`
`148`	`148`	`"Input": "0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",`
`149`		`- "Expected": "010000000000",`
	`149`	`+ "Expected": "000000000001",`
`150`	`150`	`"Name": "legacy-case-33"`
`151`	`151`	`},`
`152`	`152`	`{`
`153`	`153`	`"Input": "0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",`
`154`		`- "Expected": "01000000000000000000000000",`
	`154`	`+ "Expected": "00000000000000000000000001",`
`155`	`155`	`"Name": "legacy-case-34"`
`156`	`156`	`},`
`157`	`157`	`{`
`158`	`158`	`"Input": "0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",`
`159`		`- "Expected": "000000010000000000000000000000000000",`
	`159`	`+ "Expected": "000000000000000000000000000000000001",`
`160`	`160`	`"Name": "legacy-case-35"`
`161`	`161`	`}`
`162`	`162`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "Input": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",`
`4`		`- "Expected": "000000000000000000000000000000000000000000000000000000000000000000",`
	`3`	`+ "Input": "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002",`
	`4`	`+ "Expected": "000000000000000000000000000000000000000000000000000000000000000001",`
`5`	`5`	`"Name": "geth-fail-length",`
`6`	`6`	`"GasOld": 200,`
`7`	`7`	`"GasNew": 1600`
`@@ -141,7 +141,7 @@`
`141`	`141`	`},`
`142`	`142`	`{`
`143`	`143`	"Input": "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000181000000000000000000000000000000000000000000000000000000000000000801ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2cffffffffffffffffffffffffffffffffffffffffffffffffffffffff3b10000000006c01ffffffffffffffffffffffffffffffffffffffffffffffdffffb97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3bffffffffffffffffffffffffffffffffffffffffffffffffffffffffebafd93b37ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc5bb6affffffff3fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff2a",
`144`		`- "Expected": "0001000000000000",`
	`144`	`+ "Expected": "0000000000000001",`
`145`	`145`	`"Name": "guido-4-even",`
`146`	`146`	`"GasOld": 1026,`
`147`	`147`	`"GasNew": 94448`