refactor(benchmark): add contract deployment before tx generation

Author: LouisTsai-Csie

tests/benchmark/test_worst_compute.py

@@ -106,6 +106,7 @@ def test_worst_calldatasize(
 ):
     """Test running a block with as many CALLDATASIZE as possible."""
     generator = JumpLoopGenerator(setup=Bytecode(), attack_block=Op.POP(Op.CALLDATASIZE))
+    generator.deploy_contracts(pre, fork)
     tx = generator.generate_transaction(pre, gas_benchmark_value, fork)
     tx.data = Bytes(b"\x00" * calldata_length)
 
@@ -254,7 +255,7 @@ def test_worst_msize(
         setup=Op.MLOAD(Op.CALLVALUE) + Op.POP,
         attack_block=Op.MSIZE,
     )
-
+    generator.deploy_contracts(pre, fork)
     tx = generator.generate_transaction(pre, gas_benchmark_value, fork)
     tx.value = HexNumber(mem_size)
 
@@ -1195,9 +1196,11 @@ def test_worst_modexp(
         Op.STATICCALL(Op.GAS, 0x5, Op.PUSH0, Op.CALLDATASIZE, Op.PUSH0, Op.PUSH0)
     )
 
-    tx = JumpLoopGenerator(
+    generator = JumpLoopGenerator(
         setup=Op.CALLDATACOPY(0, 0, Op.CALLDATASIZE), attack_block=attack_block
-    ).generate_transaction(pre, gas_benchmark_value, fork)
+    )
+    generator.deploy_contracts(pre, fork)
+    tx = generator.generate_transaction(pre, gas_benchmark_value, fork)
     tx.data = Bytes(bytes(mod_exp_input).rstrip(b"\x00"))
 
     benchmark_test(
@@ -2150,6 +2153,7 @@ def test_worst_blobhash(
 ):
     """Test running a block with as many BLOBHASH instructions as possible."""
     generator = ExtCallGenerator(setup=Bytecode(), attack_block=Op.BLOBHASH(blob_index))
+    generator.deploy_contracts(pre, fork)
     tx = generator.generate_transaction(pre, gas_benchmark_value, fork)
 
     tx_type = TransactionType.LEGACY
@@ -2272,6 +2276,7 @@ def test_worst_mod(
     )
 
     generator = JumpLoopGenerator(setup=code_constant_pool, attack_block=code_segment)
+    generator.deploy_contracts(pre, fork)
     tx = generator.generate_transaction(pre, gas_benchmark_value, fork)
 
     input_value = initial_mod if not should_negate else neg(initial_mod)
@@ -2396,6 +2401,7 @@ def test_worst_modarith(
     )
 
     generator = JumpLoopGenerator(setup=code_constant_pool, attack_block=code_segment)
+    generator.deploy_contracts(pre, fork)
     tx = generator.generate_transaction(pre, gas_benchmark_value, fork)
     tx.data = Bytes(initial_mod.to_bytes(32, byteorder="big"))
 
@@ -2468,6 +2474,7 @@ def test_amortized_bn128_pairings(
     attack_block = Op.POP(Op.STATICCALL(Op.GAS, 0x08, 0, Op.CALLDATASIZE, 0, 0))
 
     generator = JumpLoopGenerator(setup=code_prefix, attack_block=attack_block)
+    generator.deploy_contracts(pre, fork)
     tx = generator.generate_transaction(pre, gas_benchmark_value, fork)
     tx.data = _generate_bn128_pairs(optimal_per_call_num_pairings, 42)
 

tests/benchmark/test_worst_stateful_opcodes.py

@@ -11,6 +11,8 @@
 
 from ethereum_test_benchmark.benchmark_code_generator import ExtCallGenerator, JumpLoopGenerator
 from ethereum_test_forks import Fork
+from ethereum_test_specs import BlockchainTestFiller
+from ethereum_test_specs.benchmark import BenchmarkTestFiller
 from ethereum_test_tools import (
     Account,
     Address,