fix linting and typing issue

Author: LouisTsai-Csie

tests/benchmark/test_worst_blocks.py

@@ -18,7 +18,6 @@
     BenchmarkTestFiller,
     Block,
     BlockchainTestFiller,
-    Environment,
     Hash,
     Transaction,
 )
@@ -117,13 +116,11 @@ def ether_transfer_case(
 def test_block_full_of_ether_transfers(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
-    env: Environment,
     case_id: str,
     ether_transfer_case: Tuple[Generator[Address, None, None], Generator[Address, None, None]],
     iteration_count: int,
     transfer_amount: int,
     intrinsic_cost: int,
-    gas_benchmark_value: int,
 ) -> None:
     """
     Single test for ether transfer scenarios.
@@ -183,8 +180,7 @@ def calldata_generator(
     gas_amount: int,
     zero_byte: int,
     total_cost_floor_per_token: int,
-    total_cost_standard_per_token: int,
-):
+) -> bytes:
     """Calculate the calldata based on the gas amount and zero byte."""
     # Gas cost calculation based on EIP-7683: (https://eips.ethereum.org/EIPS/eip-7683)
     #
@@ -228,7 +224,7 @@ def test_block_full_data(
     tx_gas_limit_cap: int,
     total_cost_standard_per_token: int,
     fork: Fork,
-):
+) -> None:
     """Test a block with empty payload."""
     iteration_count = math.ceil(gas_benchmark_value / tx_gas_limit_cap)
 
@@ -241,7 +237,6 @@ def test_block_full_data(
             gas_available,
             zero_byte,
             total_cost_floor_per_token,
-            total_cost_standard_per_token,
         )
 
         total_gas_used += fork.transaction_intrinsic_cost_calculator()(calldata=data)
@@ -272,7 +267,7 @@ def test_block_full_access_list_and_data(
     fork: Fork,
     gas_benchmark_value: int,
     tx_gas_limit_cap: int,
-):
+) -> None:
     """
     Test a block with access lists (60% gas) and calldata (40% gas) using
     random mixed bytes.

tests/benchmark/test_worst_bytecode.py

@@ -343,7 +343,6 @@ def test_worst_create(
     max_code_size_ratio: float,
     non_zero_data: bool,
     value: int,
-    gas_benchmark_value: int,
 ) -> None:
     """
     Test the CREATE and CREATE2 performance with different configurations.

tests/benchmark/test_worst_compute.py

@@ -9,6 +9,7 @@
 from typing import Any, cast
 
 import pytest
+from _pytest.mark import ParameterSet
 from py_ecc.bn128 import G1, G2, multiply
 
 from ethereum_test_base_types.base_types import Bytes, HexNumber
@@ -20,7 +21,6 @@
     BenchmarkTestFiller,
     Block,
     Bytecode,
-    Environment,
     Transaction,
     add_kzg_version,
 )
@@ -82,8 +82,6 @@ def test_worst_zero_param(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
     opcode: Op,
-    fork: Fork,
-    gas_benchmark_value: int,
 ) -> None:
     """Test running a block with as many zero-parameter opcodes as possible."""
     benchmark_test(
@@ -122,7 +120,6 @@ def test_worst_callvalue(
     fork: Fork,
     non_zero_value: bool,
     from_origin: bool,
-    gas_benchmark_value: int,
 ) -> None:
     """
     Test running a block with as many CALLVALUE opcodes as possible.
@@ -180,7 +177,6 @@ def test_worst_returndatasize_nonzero(
     pre: Alloc,
     returned_size: int,
     return_data_style: ReturnDataStyle,
-    gas_benchmark_value: int,
 ) -> None:
     """
     Test running a block which execute as many RETURNDATASIZE opcodes which
@@ -215,7 +211,7 @@ def test_worst_returndatasize_nonzero(
 def test_worst_returndatasize_zero(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
-):
+) -> None:
     """
     Test running a block with as many RETURNDATASIZE opcodes as possible with
     a zero buffer.
@@ -395,7 +391,7 @@ def test_worst_precompile_only_data_input(
     )
 
 
-def create_modexp_test_cases():
+def create_modexp_test_cases() -> list[ParameterSet]:
     """Create test cases for the MODEXP precompile."""
     test_cases = [
         # (base, exponent, modulus, test_id)
@@ -1195,7 +1191,6 @@ def test_worst_precompile_fixed_cost(
     fork: Fork,
     precompile_address: Address,
     parameters: list[str] | list[BytesConcatenation] | list[bytes],
-    gas_benchmark_value: int,
 ) -> None:
     """Test running a block filled with a precompile with fixed cost."""
     if precompile_address not in fork.precompiles():
@@ -1546,7 +1541,7 @@ def test_worst_tstore(
     pre: Alloc,
     key_mut: bool,
     dense_val_mut: bool,
-):
+) -> None:
     """Test running a block with as many TSTORE calls as possible."""
     init_key = 42
     setup = Op.PUSH1(init_key)
@@ -1825,7 +1820,7 @@ def test_worst_memory_access(
     offset: int,
     offset_initialized: bool,
     big_memory_expansion: bool,
-):
+) -> None:
     """
     Test running a block with as many memory access instructions as
     possible.
@@ -2070,12 +2065,18 @@ def test_worst_calldataload(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
     calldata: bytes,
-):
+    gas_benchmark_value: int,
+    fork: Fork,
+) -> None:
     """Test running a block with as many CALLDATALOAD as possible."""
+    tx = JumpLoopGenerator(setup=Op.PUSH0, attack_block=Op.CALLDATALOAD).generate_transaction(
+        pre, gas_benchmark_value, fork
+    )
+    tx.data = Bytes(calldata)
     benchmark_test(
         pre=pre,
         post={},
-        code_generator=JumpLoopGenerator(setup=Op.PUSH0, attack_block=Op.CALLDATALOAD),
+        tx=tx,
     )
 
 
@@ -2141,7 +2142,7 @@ def test_worst_dup(
     pre: Alloc,
     fork: Fork,
     opcode: Op,
-):
+) -> None:
     """Test running a block with as many DUP as possible."""
     max_stack_height = fork.max_stack_height()
 
@@ -2200,7 +2201,7 @@ def test_worst_push(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
     opcode: Op,
-):
+) -> None:
     """Test running a block with as many PUSH as possible."""
     benchmark_test(
         pre=pre,
@@ -2232,7 +2233,6 @@ def test_worst_return_revert(
     opcode: Op,
     return_size: int,
     return_non_zero_data: bool,
-    gas_benchmark_value: int,
 ) -> None:
     """Test running a block with as many RETURN or REVERT as possible."""
     max_code_size = fork.max_code_size()
@@ -2268,9 +2268,6 @@ def test_worst_return_revert(
 def test_worst_clz_same_input(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
-    fork: Fork,
-    gas_benchmark_value: int,
-    env: Environment,
 ) -> None:
     """Test running a block with as many CLZ with same input as possible."""
     magic_value = 248  # CLZ(248) = 248
@@ -2287,8 +2284,7 @@ def test_worst_clz_diff_input(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
     fork: Fork,
-    env: Environment,
-):
+) -> None:
     """
     Test running a block with as many CLZ with different input as
     possible.

tests/benchmark/test_worst_memory.py

@@ -155,7 +155,7 @@ def test_worst_codecopy(
     fork: Fork,
     max_code_size_ratio: float,
     fixed_src_dst: bool,
-):
+) -> None:
     """Test running a block filled with CODECOPY executions."""
     max_code_size = fork.max_code_size()
 
@@ -212,7 +212,7 @@ def test_worst_returndatacopy(
     pre: Alloc,
     size: int,
     fixed_dst: bool,
-):
+) -> None:
     """Test running a block filled with RETURNDATACOPY executions."""
     # Create the contract that will RETURN the data that will be used for
     # RETURNDATACOPY.
@@ -278,7 +278,7 @@ def test_worst_mcopy(
     pre: Alloc,
     size: int,
     fixed_src_dst: bool,
-):
+) -> None:
     """Test running a block filled with MCOPY executions."""
     src_dst = 0 if fixed_src_dst else Op.MOD(Op.GAS, 7)
     attack_block = Op.MCOPY(src_dst, src_dst, size)

tests/benchmark/test_worst_opcode.py

@@ -44,7 +44,7 @@ def test_worst_log_opcodes(
     size: int,
     fixed_offset: bool,
     non_zero_data: bool,
-):
+) -> None:
     """Test running a block with as many LOG opcodes as possible."""
     setup = Bytecode()
 

tests/benchmark/test_worst_stateful_opcodes.py

@@ -139,7 +139,7 @@ def test_worst_address_state_warm(
     pre: Alloc,
     opcode: Op,
     absent_target: bool,
-):
+) -> None:
     """
     Test running a block with as many stateful opcodes doing warm access
     for an account.
@@ -376,7 +376,7 @@ def test_worst_storage_access_warm(
     storage_action: StorageAction,
     gas_benchmark_value: int,
     env: Environment,
-):
+) -> None:
     """
     Test running a block with as many warm storage slot accesses as
     possible.
@@ -441,7 +441,7 @@ def test_worst_blockhash(
     fork: Fork,
     gas_benchmark_value: int,
     tx_gas_limit_cap: int,
-):
+) -> None:
     """
     Test running a block with as many blockhash accessing oldest allowed block
     as possible.
@@ -483,7 +483,7 @@ def test_worst_blockhash(
 def test_worst_selfbalance(
     benchmark_test: BenchmarkTestFiller,
     pre: Alloc,
-):
+) -> None:
     """Test running a block with as many SELFBALANCE opcodes as possible."""
     benchmark_test(
         pre=pre,