review comments

Author: marioevz

Diff for: tests/osaka/eip7692_eof_v1/eip7069_extcall/test_calls.py

@@ -1177,8 +1177,6 @@ def test_extdelegate_call_targets(
             to=factory_address,
             data=caller_contract,
             gas_limit=4_000_000,
-            max_priority_fee_per_gas=10,
-            max_fee_per_gas=10,
             initcodes=[caller_contract],
         )
         calling_contract_address = compute_eofcreate_address(factory_address, 0)

Diff for: tests/osaka/eip7692_eof_v1/eip7873_tx_create/test_creation_tx.py

@@ -24,9 +24,11 @@
 pytestmark = pytest.mark.valid_from(EOF_FORK_NAME)
 
 
-def test_legacy_creation_tx_legacy_initcode(
+@pytest.mark.with_all_contract_creating_tx_types(selector=lambda tx_type: tx_type != 6)
+def test_legacy_create_tx_legacy_initcode_eof_bytecode(
     state_test: StateTestFiller,
     pre: Alloc,
+    tx_type: int,
 ):
     """Test that a legacy contract creation tx cannot create EOF code."""
     env = Environment()
@@ -35,6 +37,7 @@ def test_legacy_creation_tx_legacy_initcode(
     initcode = LegacyInitcode(deploy_code=smallest_runtime_subcontainer)
 
     tx = Transaction(
+        ty=tx_type,
         sender=sender,
         to=None,
         gas_limit=100000,
@@ -55,19 +58,22 @@ def test_legacy_creation_tx_legacy_initcode(
     )
 
 
+@pytest.mark.with_all_contract_creating_tx_types(selector=lambda tx_type: tx_type != 6)
 @pytest.mark.exception_test
-def test_legacy_creation_tx_eof_initcode(
+def test_legacy_create_tx_eof_initcode(
     state_test: StateTestFiller,
     pre: Alloc,
+    tx_type: int,
 ):
     """Test that a legacy contract creation tx cannot use EOF initcode."""
     env = Environment()
     sender = pre.fund_eoa()
 
     tx = Transaction(
+        ty=tx_type,
         sender=sender,
         to=None,
-        gas_limit=100000,
+        gas_limit=100_000,
         data=smallest_initcode_subcontainer,
         error=TransactionException.EOF_CREATION_TRANSACTION,
     )

Diff for: tests/osaka/eip7692_eof_v1/eip7873_tx_create/test_txcreate.py

@@ -731,9 +731,7 @@ def test_short_data_subcontainer(
     }
     tx = Transaction(
         to=contract_address,
-        gas_limit=10_000_000,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
+        gas_limit=100_000,
         sender=sender,
         initcodes=[initcontainer],
     )

Diff for: tests/osaka/eip7692_eof_v1/eip7873_tx_create/test_txcreate_failures.py

@@ -828,7 +828,7 @@ def test_invalid_container_deployment(
             Section.Container(deployed_container),
         ],
     )
-    tx_gas_limit = 10_000_000
+    tx_gas_limit = 100_000
     fork_intrinsic_gas_calculator = fork.transaction_intrinsic_cost_calculator()
     fork_gas_costs = fork.gas_costs()
 
@@ -860,14 +860,16 @@ def test_invalid_container_deployment(
         or reason == "out_of_gas_during_initcode"
     ):
         invalid_code_path: Bytecode
-        if reason == "invalid_opcode_during_initcode":
+        if reason == "invalid_opcode_with_sstore_during_initcode":
             invalid_code_path = Op.SSTORE(0, 1) + Op.INVALID
         elif reason == "revert_opcode_during_initcode":
             invalid_code_path = Op.REVERT(0, 0)
         elif reason == "out_of_gas_during_initcode":
             invalid_code_path = Op.MSTORE(0xFFFFFFFFFFFFFFFFFFFFFFFFFFF, 1)
-        else:
+        elif reason == "invalid_opcode_during_initcode":
             invalid_code_path = Op.INVALID
+        else:
+            raise Exception(f"invalid case: {reason}")
         initcontainer = Container(
             sections=[
                 Section.Code(
@@ -931,8 +933,6 @@ def test_invalid_container_deployment(
         to=contract_address,
         sender=sender,
         gas_limit=tx_gas_limit,
-        max_priority_fee_per_gas=10,
-        max_fee_per_gas=10,
         initcodes=[initcontainer],
     )