wip

Author: pacrob

tests/frontier/opcodes/test_calldataload.py

@@ -47,10 +47,10 @@ def test_calldataload(
     Based on https://github.com/ethereum/tests/blob/ae4791077e8fcf716136e70fe8392f1a1f1495fb/src/GeneralStateTestsFiller/VMTests/vmTests/calldatacopyFiller.yml
     """
     address_a = pre.deploy_contract(
-        (Op.PUSH1[calldata_offset] + Op.CALLDATALOAD + Op.PUSH1[0x0] + Op.SSTORE + Op.STOP),
+        Op.SSTORE(0, Op.CALLDATALOAD(offset=calldata_offset)) + Op.STOP,
     )
 
-    address_b = pre.deploy_contract(
+    to = pre.deploy_contract(
         Om.MSTORE(calldata, 0x0)
         + Op.CALL(
             gas=Op.SUB(Op.GAS(), 0x100),
@@ -61,22 +61,7 @@ def test_calldataload(
             ret_offset=0x0,
             ret_size=0x0,
         )
-    )
-
-    to = pre.deploy_contract(
-        code=(
-            Op.ADD(0x1000, Op.CALLDATALOAD(offset=0x4))
-            + Op.CALL(
-                gas=Op.SUB(Op.GAS(), 0x100),
-                address=address_b,
-                value=0x0,
-                args_offset=0x0,
-                args_size=0x0,
-                ret_offset=0x0,
-                ret_size=0x0,
-            )
-            + Op.STOP
-        ),
+        + Op.STOP
     )
 
     tx = Transaction(