more updates from feedback

ethereum · Jan 10, 2025 · b012d0b · b012d0b
1 parent cfcf639
commit b012d0b
Showing 1 changed file with 9 additions and 31 deletions.
diff --git a/tests/frontier/opcodes/test_calldatacopy.py b/tests/frontier/opcodes/test_calldatacopy.py
@@ -17,10 +17,7 @@
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
                 + Op.SSTORE
-                + Op.MSIZE
-                + Op.PUSH1[0x0]
-                + Op.RETURN
-                + Op.STOP
+                + Op.RETURN(offset=0, size=Op.MSIZE)
             ),
             b"\x00",
             Account(
@@ -37,10 +34,7 @@
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
                 + Op.SSTORE
-                + Op.MSIZE
-                + Op.PUSH1[0x0]
-                + Op.RETURN
-                + Op.STOP
+                + Op.RETURN(offset=0, size=Op.MSIZE)
             ),
             b"\x01",
             Account(
@@ -57,10 +51,7 @@
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
                 + Op.SSTORE
-                + Op.MSIZE
-                + Op.PUSH1[0x0]
-                + Op.RETURN
-                + Op.STOP
+                + Op.RETURN(offset=0, size=Op.MSIZE)
             ),
             b"\x02",
             Account(
@@ -77,10 +68,7 @@
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
                 + Op.SSTORE
-                + Op.MSIZE
-                + Op.PUSH1[0x0]
-                + Op.RETURN
-                + Op.STOP
+                + Op.RETURN(offset=0, size=Op.MSIZE)
             ),
             b"\x03",
             Account(
@@ -101,10 +89,7 @@
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
                 + Op.SSTORE
-                + Op.MSIZE
-                + Op.PUSH1[0x0]
-                + Op.RETURN
-                + Op.STOP
+                + Op.RETURN(offset=0, size=Op.MSIZE)
             ),
             b"\x04",
             Account(storage={0x00: 0x00}),
@@ -121,10 +106,7 @@
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
                 + Op.SSTORE
-                + Op.MSIZE
-                + Op.PUSH1[0x0]
-                + Op.RETURN
-                + Op.STOP
+                + Op.RETURN(offset=0, size=Op.MSIZE)
             ),
             b"\x05",
             Account(storage={0x00: 0x00}),
@@ -153,10 +135,7 @@
                 + Op.PUSH1[0x42]
                 + Op.PUSH1[0x1F]
                 + Op.MSTORE8
-                + Op.PUSH2[0x103]
-                + Op.PUSH1[0x0]
-                + Op.PUSH1[0x1F]
-                + Op.CALLDATACOPY
+                + Op.CALLDATACOPY(dest_offset=0x1F, offset=0x0, size=0x103)
                 + Op.PUSH1[0x0]
                 + Op.MLOAD
                 + Op.DUP1
@@ -190,7 +169,7 @@ def test_calldatacopy(
     tx_data: bytes,
     pre: Alloc,
     code_address_storage: Account,
-    to_address_storage: Account,
+    to_address_storage: Account | None,
 ):
     """
     Test `CALLDATACOPY` opcode.
@@ -231,9 +210,8 @@ def test_calldatacopy(
 
     tx = Transaction(
         data=tx_data,
-        gas_limit=0x04C4B400,
+        gas_limit=0x100_000,
         gas_price=0x0A,
-        nonce=0x00,
         sender=pre.fund_eoa(),
         to=to,
         value=0x01,