fix: update benchmark wrapper for execute mode

Author: LouisTsai-Csie

packages/testing/src/execution_testing/specs/benchmark.py

@@ -251,8 +251,8 @@ def generate_blocks_from_code_generator(self, fork: Fork) -> List[Block]:
 
         return [execution_block]
 
-    def generate_blockchain_test(self, fork: Fork) -> BlockchainTest:
-        """Create a BlockchainTest from this BenchmarkTest."""
+    def generate_blocks(self, fork: Fork) -> List[Block]:
+        """Generate blocks for the benchmark test."""
         set_props = [
             name
             for name, val in [
@@ -268,7 +268,7 @@ def generate_blockchain_test(self, fork: Fork) -> BlockchainTest:
                 f"Exactly one must be set, but got {len(set_props)}: {', '.join(set_props)}"
             )
 
-        blocks: List[Block] = self.setup_blocks
+        blocks: List[Block] = []
 
         if self.code_generator is not None:
             generated_blocks = self.generate_blocks_from_code_generator(fork)
@@ -291,6 +291,12 @@ def generate_blockchain_test(self, fork: Fork) -> BlockchainTest:
                 "Cannot create BlockchainTest without a code generator, transactions, or blocks"
             )
 
+        return blocks
+
+    def generate_blockchain_test(self, fork: Fork) -> BlockchainTest:
+        """Create a BlockchainTest from this BenchmarkTest."""
+        blocks: List[Block] = self.setup_blocks + self.generate_blocks(fork)
+
         return BlockchainTest.from_test(
             base_test=self,
             genesis_environment=self.env,
@@ -323,11 +329,10 @@ def execute(
         execute_format: ExecuteFormat,
     ) -> BaseExecute:
         """Execute the benchmark test by sending it to the live network."""
-        del fork
-
         if execute_format == TransactionPost:
+            blocks = self.generate_blocks(fork)
             return TransactionPost(
-                blocks=[[self.tx]],
+                blocks=[block.txs for block in blocks],
                 post=self.post,
             )
         raise Exception(f"Unsupported execute format: {execute_format}")

tests/benchmark/test_worst_stateful_opcodes.py

@@ -95,7 +95,7 @@ def test_worst_address_state_cold(
 
         setup_tx = Transaction(
             to=factory_address,
-            gas_limit=env.gas_limit,
+            gas_limit=20 * gas_benchmark_value,
             sender=pre.fund_eoa(),
         )
         blocks.append(Block(txs=[setup_tx]))
@@ -362,7 +362,7 @@ def test_worst_storage_access_cold(
     sender_addr = pre.fund_eoa()
     setup_tx = Transaction(
         to=None,
-        gas_limit=env.gas_limit,
+        gas_limit=20 * gas_benchmark_value,
         data=creation_code,
         sender=sender_addr,
     )
@@ -441,7 +441,7 @@ def test_worst_storage_access_warm(
         sender_addr = pre.fund_eoa()
         setup_tx = Transaction(
             to=None,
-            gas_limit=env.gas_limit,
+            gas_limit=20 * gas_benchmark_value,
             data=creation_code,
             sender=sender_addr,
         )
@@ -631,7 +631,7 @@ def test_worst_selfdestruct_existing(
 
     contracts_deployment_tx = Transaction(
         to=factory_caller_address,
-        gas_limit=env.gas_limit,
+        gas_limit=20 * gas_benchmark_value,
         data=Hash(num_contracts),
         sender=pre.fund_eoa(),
     )