add more parametrization

tests/constantinople/eip1014_create2/test_create_returndata.py

@@ -8,7 +8,6 @@
 from ethereum.crypto.hash import keccak256
 
 from ethereum_test_tools import Account, Alloc, Environment, StateTestFiller, Transaction
-from ethereum_test_tools.vm.opcode import Bytecode
 from ethereum_test_tools.vm.opcode import Opcodes as Op
 
 from .spec import ref_spec_1014
@@ -20,9 +19,13 @@
 @pytest.mark.valid_from("Istanbul")
 @pytest.mark.parametrize("call_return_size", [35, 32, 0])
 @pytest.mark.parametrize("create_type", [Op.CREATE, Op.CREATE2])
+@pytest.mark.parametrize("return_type", [Op.RETURN, Op.REVERT])
+@pytest.mark.parametrize("return_type_in_create", [Op.RETURN, Op.REVERT])
 def test_create2_return_data(
     call_return_size: int,
     create_type: Op,
+    return_type: Op,
+    return_type_in_create: Op,
     pre: Alloc,
     state_test: StateTestFiller,
 ):
@@ -35,68 +38,82 @@ def test_create2_return_data(
     slot_return_data_hash_before_create = 2
     slot_return_data_hash_after_create = 3
     slot_code_worked = 4
+    slot_returndatacopy_before_create = 5
+    slot_returndatacopy_before_create_2 = 6
+    slot_returndatacopy_after_create = 7
 
     # CREATE2 Initcode
     create2_salt = 1
-    initcode = Op.MSTORE(0, 0x112233) + Op.RETURN(0, 32) + Op.STOP()
-
-    def make_create() -> Bytecode:
-        if create_type == Op.CREATE2:
-            return Op.CREATE2(0, 0x100, Op.CALLDATASIZE(), create2_salt)
-        elif create_type == Op.CREATE:
-            return Op.CREATE(0, 0x100, Op.CALLDATASIZE())
-        raise NotImplementedError
-
-    call_return_data_value = 0x0000111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF
-    call_return_data = int.to_bytes(call_return_data_value, 32, byteorder="big").ljust(
+    initcode = Op.MSTORE(0, 0x112233) + return_type_in_create(0, 32)
+    call_return_data_value = 0x1122334455667788991011121314151617181920212223242526272829303132
+    expected_call_return_data = int.to_bytes(call_return_data_value, 32, byteorder="big").ljust(
         call_return_size, b"\0"
     )[0:call_return_size]
-    empty_data = int.to_bytes(call_return_data_value, 32, byteorder="big").ljust(
-        call_return_size, b"\0"
-    )[0:0]
+    expected_returndatacopy = expected_call_return_data[0:32]
+    empty_data = b""
 
     address_call = pre.deploy_contract(
-        code=Op.JUMPDEST() + Op.MSTORE(0, call_return_data_value) + Op.RETURN(0, call_return_size),
+        code=Op.MSTORE(0, call_return_data_value)
+        + Op.MSTORE(32, 0xFFFFFFFF)
+        + return_type(0, call_return_size),
         storage={},
     )
     address_to = pre.deploy_contract(
         balance=100_000_000,
         code=Op.JUMPDEST()
         + Op.MSTORE(0x100, Op.CALLDATALOAD(0))
         + Op.CALL(0x0900000000, address_call, 0, 0, 0, 0, call_return_size)
+        #
+        #
         + Op.SSTORE(slot_returndatasize_before_create, Op.RETURNDATASIZE())
+        + Op.RETURNDATACOPY(0x200, 0, call_return_size)
+        + Op.SSTORE(slot_returndatacopy_before_create, Op.MLOAD(0x200))
+        + Op.SSTORE(slot_returndatacopy_before_create_2, Op.MLOAD(0x220))
         + Op.SSTORE(slot_return_data_hash_before_create, Op.SHA3(0, call_return_size))
-        + make_create()
+        #
+        #
+        + create_type(offset=0x100, size=Op.CALLDATASIZE(), salt=create2_salt)
         + Op.SSTORE(slot_returndatasize_after_create, Op.RETURNDATASIZE())
-        + Op.SSTORE(slot_return_data_hash_after_create, Op.SHA3(0, Op.RETURNDATASIZE()))
+        + Op.RETURNDATACOPY(0x300, 0, Op.RETURNDATASIZE())
+        + Op.SSTORE(slot_returndatacopy_after_create, Op.MLOAD(0x300))
+        + Op.SSTORE(slot_return_data_hash_after_create, Op.SHA3(0x300, Op.RETURNDATASIZE()))
         + Op.SSTORE(slot_code_worked, 1)
         + Op.STOP(),
         storage={
             slot_returndatasize_before_create: 0xFF,
             slot_returndatasize_after_create: 0xFF,
             slot_return_data_hash_before_create: 0xFF,
             slot_return_data_hash_after_create: 0xFF,
+            slot_returndatacopy_before_create: 0xFF,
+            slot_returndatacopy_before_create_2: 0xFF,
+            slot_returndatacopy_after_create: 0xFF,
         },
     )
 
     post = {
         address_to: Account(
             storage={
                 slot_code_worked: 1,
+                slot_returndatacopy_before_create: expected_returndatacopy,
+                slot_returndatacopy_before_create_2: 0,
+                slot_returndatacopy_after_create: 0x112233
+                if return_type_in_create == Op.REVERT
+                else 0,
                 slot_returndatasize_before_create: call_return_size,
-                slot_returndatasize_after_create: 0,
-                slot_return_data_hash_before_create: keccak256(call_return_data),
-                slot_return_data_hash_after_create: keccak256(empty_data),
-            }
+                slot_returndatasize_after_create: 0
+                if return_type_in_create == Op.RETURN
+                else 0x20,
+                slot_return_data_hash_before_create: keccak256(expected_call_return_data),
+                slot_return_data_hash_after_create: keccak256(empty_data)
+                if return_type_in_create == Op.RETURN
+                else keccak256(int.to_bytes(0x112233, 32, byteorder="big")),
+            }  # type: ignore
         )
     }
 
     tx = Transaction(
-        ty=0x0,
-        chain_id=0x0,
-        sender=pre.fund_eoa(7_000_000_000_000_000_000),
+        sender=pre.fund_eoa(),
         to=address_to,
-        gas_price=10,
         protected=False,
         data=initcode,
         gas_limit=0x0A00000000,