wip

Author: pacrob

tests/frontier/opcodes/test_calldatasize.py

@@ -8,47 +8,87 @@
 
 
 @pytest.mark.parametrize(
-    "mstore,args_size,code_for_address_a,tx_data,address_a_storage",
+    "tx_data,storage",
     [
         (
-            (Op.MSTORE8(offset=0x0, value=0x25) + Op.MSTORE8(offset=0x1, value=0x60)),
-            0x2,
-            (Op.PUSH1[0x0] + Op.CALLDATALOAD + Op.PUSH1[0x0] + Op.SSTORE),
-            b"\x00",
-            Account(
-                storage={0x00: 0x2560000000000000000000000000000000000000000000000000000000000000}
-            ),
-        ),
-        (
-            (
-                Op.MSTORE(
-                    offset=0x0,
-                    value=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF,
-                )
-                + Op.MSTORE8(offset=0x20, value=0x23)
-            ),
+            (b"\x02", b"\x01"),
+            Account(storage={0x00: 0x02}),
+        ),
+        (
+            (0x11, 1),
+            Account(storage={0x00: 0x11}),
+        ),
+        (
+            (0x21, 1),
+            Account(storage={0x00: 0x21}),
+        ),
+        (
+            (0x31, 1),
+            Account(storage={0x00: 0x31}),
+        ),
+        (
+            (0x101, 1),
+            Account(storage={0x00: 0x101}),
+        ),
+        (
+            0x02,
+            Account(storage={0x00: 0x02}),
+        ),
+        (
+            0x11,
+            Account(storage={0x00: 0x11}),
+        ),
+        (
+            0x21,
+            Account(storage={0x00: 0x21}),
+        ),
+        (
+            0x31,
+            Account(storage={0x00: 0x31}),
+        ),
+        (
+            0x101,
+            Account(storage={0x00: 0x101}),
+        ),
+        (
+            0x02,
+            Account(storage={0x00: 0x02}),
+        ),
+        (
+            0x11,
+            Account(storage={0x00: 0x11}),
+        ),
+        (
+            0x21,
+            Account(storage={0x00: 0x21}),
+        ),
+        (
+            0x31,
+            Account(storage={0x00: 0x31}),
+        ),
+        (
+            0x101,
+            Account(storage={0x00: 0x101}),
+        ),
+        (
+            0x02,
+            Account(storage={0x00: 0x02}),
+        ),
+        (
+            0x11,
+            Account(storage={0x00: 0x11}),
+        ),
+        (
             0x21,
-            (Op.PUSH1[0x1] + Op.CALLDATALOAD + Op.PUSH1[0x0] + Op.SSTORE + Op.STOP),
-            b"\x01",
-            Account(
-                storage={0x00: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF23}
-            ),
-        ),
-        (
-            (
-                Op.MSTORE(
-                    offset=0x0,
-                    value=0x123456789ABCDEF0000000000000000000000000000000000000000000000000,
-                )
-                + Op.MSTORE8(offset=0x20, value=0x0)
-                + Op.MSTORE8(offset=0x21, value=0x24)
-            ),
-            0x22,
-            (Op.PUSH1[0x5] + Op.CALLDATALOAD + Op.PUSH1[0x0] + Op.SSTORE + Op.STOP),
-            b"\x02",
-            Account(
-                storage={0x00: 0xBCDEF00000000000000000000000000000000000000000000000000024000000}
-            ),
+            Account(storage={0x00: 0x21}),
+        ),
+        (
+            0x31,
+            Account(storage={0x00: 0x31}),
+        ),
+        (
+            0x101,
+            Account(storage={0x00: 0x101}),
         ),
     ],
     ids=[
@@ -79,7 +119,7 @@ def test_calldataload(
     fork: Fork,
     tx_data: bytes,
     pre: Alloc,
-    address_a_storage: Account,
+    storage: Account,
 ):
     """
     Test `CALLDATASIZE` opcode.
@@ -112,5 +152,5 @@ def test_calldataload(
         to=to,
         value=0x01,
     )
-    post = {address: address_a_storage}
+    post = {address: storage}
     state_test(pre=pre, post=post, tx=tx)