chore(tests): EIP-7069 - drop unnecessary params

ethereum · Jul 31, 2024 · 1b2461e · 1b2461e
1 parent 2fce17b
commit 1b2461e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/tests/prague/eip7692_eof_v1/eip7069_extcall/test_address_space_extension.py b/tests/prague/eip7692_eof_v1/eip7069_extcall/test_address_space_extension.py
@@ -209,8 +209,6 @@ def test_address_space_extension(
         sender=sender,
         to=address_entry_point,
         gas_limit=50_000_000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 

diff --git a/tests/prague/eip7692_eof_v1/eip7069_extcall/test_calldata.py b/tests/prague/eip7692_eof_v1/eip7069_extcall/test_calldata.py
@@ -65,7 +65,7 @@ def test_extcalls_inputdata(
     """
     env = Environment()
 
-    sender = pre.fund_eoa(10**18)
+    sender = pre.fund_eoa()
 
     address_returner = pre.deploy_contract(
         Container(
@@ -152,7 +152,7 @@ def test_extdelegatecall_inputdata(
     """
     env = Environment()
 
-    sender = pre.fund_eoa(10**18)
+    sender = pre.fund_eoa()
 
     address_returner = pre.deploy_contract(
         Container(
@@ -236,7 +236,7 @@ def test_extstaticcall_inputdata(
     """
     env = Environment()
 
-    sender = pre.fund_eoa(10**18)
+    sender = pre.fund_eoa()
 
     address_returner = pre.deploy_contract(
         Container(
@@ -316,7 +316,7 @@ def test_calldata_remains_after_subcall(
     """
     env = Environment()
 
-    sender = pre.fund_eoa(10**18)
+    sender = pre.fund_eoa()
 
     address_sub_called = pre.deploy_contract(
         Container(

diff --git a/tests/prague/eip7692_eof_v1/eip7069_extcall/test_calls.py b/tests/prague/eip7692_eof_v1/eip7069_extcall/test_calls.py
@@ -90,8 +90,6 @@ def test_legacy_calls_eof_sstore(
         sender=sender,
         to=Address(calling_contract_address),
         gas_limit=50000000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 
@@ -165,8 +163,6 @@ def test_legacy_calls_eof_mstore(
         sender=sender,
         to=Address(calling_contract_address),
         gas_limit=50000000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 
@@ -223,8 +219,6 @@ def test_eof_calls_eof_sstore(
         sender=sender,
         to=Address(calling_contract_address),
         gas_limit=50000000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 
@@ -299,8 +293,6 @@ def test_eof_calls_eof_mstore(
         sender=sender,
         to=Address(calling_contract_address),
         gas_limit=50000000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 
@@ -359,8 +351,6 @@ def test_eof_calls_legacy_sstore(
         sender=sender,
         to=Address(calling_contract_address),
         gas_limit=50000000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 
@@ -429,8 +419,6 @@ def test_eof_calls_legacy_mstore(
         sender=sender,
         to=Address(calling_contract_address),
         gas_limit=50000000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 
@@ -502,8 +490,6 @@ def test_eof_calls_revert_abort(
         sender=sender,
         to=Address(calling_contract_address),
         gas_limit=50000000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 
@@ -558,8 +544,6 @@ def test_eof_calls_eof_then_fails(
         sender=sender,
         to=Address(calling_contract_address),
         gas_limit=50000000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 
@@ -612,7 +596,7 @@ def test_eof_calls_clear_return_buffer(
         case "empty":
             target_address = b"\x78" * 20
         case "EOA":
-            target_address = pre.fund_eoa(10**18)
+            target_address = pre.fund_eoa()
         case "LegacyContract":
             target_address = pre.deploy_contract(
                 code=Op.STOP,
@@ -639,8 +623,6 @@ def test_eof_calls_clear_return_buffer(
         sender=sender,
         to=Address(calling_contract_address),
         gas_limit=50000000,
-        gas_price=10,
-        protected=False,
         data="",
     )
 

diff --git a/tests/prague/eip7692_eof_v1/eip7069_extcall/test_returndataload.py b/tests/prague/eip7692_eof_v1/eip7069_extcall/test_returndataload.py
@@ -2,8 +2,6 @@
 abstract: Tests [EIP-7069: Revamped CALL instructions](https://eips.ethereum.org/EIPS/eip-7069)
     Tests for the RETURNDATALOAD instriction
 """  # noqa: E501
-from typing import List
-
 import pytest
 
 from ethereum_test_tools import Account, Alloc, Environment, StateTestFiller, Storage, Transaction
@@ -94,7 +92,7 @@ def test_returndatacopy_handling(
 
     slot_result_start = 0x1000
 
-    sender = pre.fund_eoa(10**18)
+    sender = pre.fund_eoa()
 
     address_returner = pre.deploy_contract(
         Container(
@@ -222,7 +220,7 @@ def test_returndataload_handling(
 
     slot_result_start = 0x1000
 
-    sender = pre.fund_eoa(10**18)
+    sender = pre.fund_eoa()
     address_returner = pre.deploy_contract(
         Container(
             sections=[
@@ -288,7 +286,7 @@ def test_returndatacopy_oob(
     """
     env = Environment()
 
-    sender = pre.fund_eoa(10**18)
+    sender = pre.fund_eoa()
 
     # Both callee codes below make an OOB (out-of-bounds) RETURNDATACOPY of one byte,
     # which they then attempt to return (Legacy should exceptionally halt on RETURNDATACOPY).