fix: update benchmark wrapper for execute mode

Author: LouisTsai-Csie

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

@@ -290,8 +290,52 @@ def generate_blocks_from_code_generator(self) -> List[Block]:
 
         return [execution_block]
 
-    def generate_blockchain_test(self) -> BlockchainTest:
+    def generate_blocks(self, fork: Fork) -> List[Block]:
+        """Generate blocks for the benchmark test."""
+        set_props = [
+            name
+            for name, val in [
+                ("code_generator", self.code_generator),
+                ("blocks", self.blocks),
+                ("tx", self.tx),
+            ]
+            if val is not None
+        ]
+
+        if len(set_props) != 1:
+            raise ValueError(
+                f"Exactly one must be set, but got {len(set_props)}: {', '.join(set_props)}"
+            )
+
+        blocks: List[Block] = []
+
+        if self.code_generator is not None:
+            generated_blocks = self.generate_blocks_from_code_generator(fork)
+            blocks += generated_blocks
+
+        elif self.blocks is not None:
+            blocks += self.blocks
+
+        elif self.tx is not None:
+            gas_limit = (
+                fork.transaction_gas_limit_cap() or self.gas_benchmark_value
+            )
+
+            transactions = self.split_transaction(self.tx, gas_limit)
+
+            blocks.append(Block(txs=transactions))
+
+        else:
+            raise ValueError(
+                "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,8 +367,9 @@ def execute(
     ) -> BaseExecute:
         """Execute the benchmark test by sending it to the live network."""
         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(),
     )