fix(testing/specs): Fix benchmark pre-alloc grouping (#1708)

* fix(testing/specs): Fix benchmark spec genesis

* refactor(testing/specs): Fork field in BaseTest

* fix(testing/specs): Benchmark initialization

* refactor(testing): Remove `fork` from generate

Author: marioevz

packages/testing/src/execution_testing/cli/eofwrap.py

@@ -323,6 +323,7 @@ def _wrap_fixture(
 
         test = BlockchainTest(
             genesis_environment=env,
+            fork=EOFv1,
             pre=pre.root,
             post=fixture.post_state.root if fixture.post_state else {},
             blocks=[],
@@ -373,7 +374,6 @@ def _wrap_fixture(
 
         result = test.generate(
             t8n=t8n,
-            fork=EOFv1,
             fixture_format=BlockchainFixture,
         )
         assert isinstance(result, BlockchainFixture)

packages/testing/src/execution_testing/cli/fuzzer_bridge/blocktest_builder.py

@@ -68,7 +68,6 @@ def build_blocktest(
         # Generate fixture
         fixture = test.generate(
             t8n=self.t8n,
-            fork=fork,
             fixture_format=BlockchainFixture,
         )
 

packages/testing/src/execution_testing/cli/fuzzer_bridge/converter.py

@@ -251,6 +251,7 @@ def blockchain_test_from_fuzzer(
 
     return BlockchainTest(
         pre=pre,
+        fork=fork,
         blocks=blocks,
         post={},  # Post-state verification can be added later
         genesis_environment=genesis_env,

packages/testing/src/execution_testing/cli/fuzzer_bridge/production_test.py

@@ -201,6 +201,7 @@ def generate_fixture(self, test_params: Dict[str, Any]) -> Dict[str, Any]:
         # Create test
         test = BlockchainTest(
             genesis_environment=test_params["genesis_environment"],
+            fork=fork,
             pre=test_params["pre"],
             post=test_params["post"],
             blocks=test_params["blocks"],
@@ -210,7 +211,6 @@ def generate_fixture(self, test_params: Dict[str, Any]) -> Dict[str, Any]:
         # Generate fixture
         fixture = test.generate(
             t8n=self.t8n,
-            fork=fork,
             fixture_format=BlockchainFixture,
         )
 

packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/execute.py

@@ -407,6 +407,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                     kwargs["expected_benchmark_gas_used"] = (
                         request.getfixturevalue("gas_benchmark_value")
                     )
+                kwargs["fork"] = fork
                 kwargs |= {
                     p: request.getfixturevalue(p)
                     for p in cls_fixture_parameters
@@ -436,9 +437,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                     [str(eoa) for eoa in pre._funded_eoa]
                 )
 
-                execute = self.execute(
-                    fork=fork, execute_format=execute_format
-                )
+                execute = self.execute(execute_format=execute_format)
                 execute.execute(
                     fork=fork,
                     eth_rpc=eth_rpc,

packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/filler.py

@@ -28,11 +28,11 @@
     Alloc,
     ReferenceSpec,
 )
-from execution_testing.client_clis import TransitionTool
-from execution_testing.client_clis.clis.geth import FixtureConsumerTool
 from execution_testing.cli.gen_index import (
     generate_fixtures_index,
 )
+from execution_testing.client_clis import TransitionTool
+from execution_testing.client_clis.clis.geth import FixtureConsumerTool
 from execution_testing.fixtures import (
     BaseFixture,
     FixtureCollector,
@@ -1350,6 +1350,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                     kwargs["pre"] = pre
                 if "expected_benchmark_gas_used" not in kwargs:
                     kwargs["expected_benchmark_gas_used"] = gas_benchmark_value
+                kwargs["fork"] = fork
                 kwargs |= {
                     p: request.getfixturevalue(p)
                     for p in cls_fixture_parameters
@@ -1380,7 +1381,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                     # Use the original update_pre_alloc_groups method which
                     # returns the groups
                     self.update_pre_alloc_groups(
-                        session.pre_alloc_groups, fork, request.node.nodeid
+                        session.pre_alloc_groups, request.node.nodeid
                     )
                     return  # Skip fixture generation in phase 1
 
@@ -1391,15 +1392,12 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
                     FixtureFillingPhase.PRE_ALLOC_GENERATION
                     in fixture_format.format_phases
                 ):
-                    pre_alloc_hash = self.compute_pre_alloc_group_hash(
-                        fork=fork
-                    )
+                    pre_alloc_hash = self.compute_pre_alloc_group_hash()
                     group = session.get_pre_alloc_group(pre_alloc_hash)
                     self.pre = group.pre
                 try:
                     fixture = self.generate(
                         t8n=t8n,
-                        fork=fork,
                         fixture_format=fixture_format,
                     )
                 finally:

packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_prealloc_group.py

@@ -24,12 +24,14 @@ class MockTest(BaseTest):
     def __init__(
         self,
         pre: Alloc,
+        fork: Fork,
         genesis_environment: Environment,
         request: Mock | None = None,
     ) -> None:
         """Initialize mock test."""
         super().__init__(  # type: ignore
             pre=pre,
+            fork=fork,
             genesis_environment=genesis_environment,
         )
         self._request = request
@@ -38,9 +40,9 @@ def generate(self, *args: Any, **kwargs: Any) -> BaseFixture:
         """Mock generate method."""
         raise NotImplementedError("This is a mock test class")
 
-    def get_genesis_environment(self, fork: Fork) -> Environment:
+    def get_genesis_environment(self) -> Environment:
         """Return the genesis environment."""
-        return self.genesis_environment.set_fork_requirements(fork)
+        return self.genesis_environment.set_fork_requirements(self.fork)
 
 
 def test_pre_alloc_group_separate() -> None:
@@ -51,8 +53,8 @@ def test_pre_alloc_group_separate() -> None:
     fork = Prague
 
     # Create test without marker
-    test1 = MockTest(pre=pre, genesis_environment=env)
-    hash1 = test1.compute_pre_alloc_group_hash(fork)
+    test1 = MockTest(pre=pre, genesis_environment=env, fork=fork)
+    hash1 = test1.compute_pre_alloc_group_hash()
 
     # Create test with "separate" marker
     mock_request = Mock()
@@ -62,15 +64,17 @@ def test_pre_alloc_group_separate() -> None:
     mock_marker.args = ("separate",)
     mock_request.node.get_closest_marker = Mock(return_value=mock_marker)
 
-    test2 = MockTest(pre=pre, genesis_environment=env, request=mock_request)
-    hash2 = test2.compute_pre_alloc_group_hash(fork)
+    test2 = MockTest(
+        pre=pre, genesis_environment=env, request=mock_request, fork=fork
+    )
+    hash2 = test2.compute_pre_alloc_group_hash()
 
     # Hashes should be different due to "separate" marker
     assert hash1 != hash2
 
     # Create another test without marker - should match first test
-    test3 = MockTest(pre=pre, genesis_environment=env)
-    hash3 = test3.compute_pre_alloc_group_hash(fork)
+    test3 = MockTest(pre=pre, genesis_environment=env, fork=fork)
+    hash3 = test3.compute_pre_alloc_group_hash()
 
     assert hash1 == hash3
 
@@ -89,8 +93,10 @@ def test_pre_alloc_group_custom_salt() -> None:
     mock_marker1.args = ("eip1234",)
     mock_request1.node.get_closest_marker = Mock(return_value=mock_marker1)
 
-    test1 = MockTest(pre=pre, genesis_environment=env, request=mock_request1)
-    hash1 = test1.compute_pre_alloc_group_hash(fork)
+    test1 = MockTest(
+        pre=pre, genesis_environment=env, request=mock_request1, fork=fork
+    )
+    hash1 = test1.compute_pre_alloc_group_hash()
 
     # Create another test with same custom group "eip1234"
     mock_request2 = Mock()
@@ -102,8 +108,10 @@ def test_pre_alloc_group_custom_salt() -> None:
     mock_marker2.args = ("eip1234",)  # Same group
     mock_request2.node.get_closest_marker = Mock(return_value=mock_marker2)
 
-    test2 = MockTest(pre=pre, genesis_environment=env, request=mock_request2)
-    hash2 = test2.compute_pre_alloc_group_hash(fork)
+    test2 = MockTest(
+        pre=pre, genesis_environment=env, request=mock_request2, fork=fork
+    )
+    hash2 = test2.compute_pre_alloc_group_hash()
 
     # Hashes should be the same - both in "eip1234" group
     assert hash1 == hash2
@@ -116,8 +124,10 @@ def test_pre_alloc_group_custom_salt() -> None:
     mock_marker3.args = ("eip5678",)  # Different group
     mock_request3.node.get_closest_marker = Mock(return_value=mock_marker3)
 
-    test3 = MockTest(pre=pre, genesis_environment=env, request=mock_request3)
-    hash3 = test3.compute_pre_alloc_group_hash(fork)
+    test3 = MockTest(
+        pre=pre, genesis_environment=env, request=mock_request3, fork=fork
+    )
+    hash3 = test3.compute_pre_alloc_group_hash()
 
     # Hash should be different - different custom group
     assert hash1 != hash3
@@ -138,8 +148,10 @@ def test_pre_alloc_group_separate_different_nodeids() -> None:
     mock_marker1.args = ("separate",)
     mock_request1.node.get_closest_marker = Mock(return_value=mock_marker1)
 
-    test1 = MockTest(pre=pre, genesis_environment=env, request=mock_request1)
-    hash1 = test1.compute_pre_alloc_group_hash(fork)
+    test1 = MockTest(
+        pre=pre, genesis_environment=env, request=mock_request1, fork=fork
+    )
+    hash1 = test1.compute_pre_alloc_group_hash()
 
     # Create test with "separate" and nodeid2
     mock_request2 = Mock()
@@ -149,8 +161,10 @@ def test_pre_alloc_group_separate_different_nodeids() -> None:
     mock_marker2.args = ("separate",)
     mock_request2.node.get_closest_marker = Mock(return_value=mock_marker2)
 
-    test2 = MockTest(pre=pre, genesis_environment=env, request=mock_request2)
-    hash2 = test2.compute_pre_alloc_group_hash(fork)
+    test2 = MockTest(
+        pre=pre, genesis_environment=env, request=mock_request2, fork=fork
+    )
+    hash2 = test2.compute_pre_alloc_group_hash()
 
     # Hashes should be different due to different nodeids
     assert hash1 != hash2
@@ -168,12 +182,14 @@ def test_no_pre_alloc_group_marker() -> None:
     mock_request.node.nodeid = "test_module.py::test_function"
     mock_request.node.get_closest_marker = Mock(return_value=None)  # No marker
 
-    test1 = MockTest(pre=pre, genesis_environment=env, request=mock_request)
-    hash1 = test1.compute_pre_alloc_group_hash(fork)
+    test1 = MockTest(
+        pre=pre, genesis_environment=env, request=mock_request, fork=fork
+    )
+    hash1 = test1.compute_pre_alloc_group_hash()
 
     # Create test without any request
-    test2 = MockTest(pre=pre, genesis_environment=env)
-    hash2 = test2.compute_pre_alloc_group_hash(fork)
+    test2 = MockTest(pre=pre, genesis_environment=env, fork=fork)
+    hash2 = test2.compute_pre_alloc_group_hash()
 
     # Hashes should be the same - both have no marker
     assert hash1 == hash2
@@ -196,8 +212,10 @@ def test_pre_alloc_group_with_reason() -> None:
     }
     mock_request1.node.get_closest_marker = Mock(return_value=mock_marker1)
 
-    test1 = MockTest(pre=pre, genesis_environment=env, request=mock_request1)
-    hash1 = test1.compute_pre_alloc_group_hash(fork)
+    test1 = MockTest(
+        pre=pre, genesis_environment=env, request=mock_request1, fork=fork
+    )
+    hash1 = test1.compute_pre_alloc_group_hash()
 
     # Create another test with same group but different reason
     mock_request2 = Mock()
@@ -208,8 +226,10 @@ def test_pre_alloc_group_with_reason() -> None:
     mock_marker2.kwargs = {"reason": "Different reason but same group"}
     mock_request2.node.get_closest_marker = Mock(return_value=mock_marker2)
 
-    test2 = MockTest(pre=pre, genesis_environment=env, request=mock_request2)
-    hash2 = test2.compute_pre_alloc_group_hash(fork)
+    test2 = MockTest(
+        pre=pre, genesis_environment=env, request=mock_request2, fork=fork
+    )
+    hash2 = test2.compute_pre_alloc_group_hash()
 
     # Hashes should be the same - reason doesn't affect grouping
     assert hash1 == hash2

packages/testing/src/execution_testing/client_clis/tests/test_transition_tools_support.py

@@ -265,12 +265,12 @@ def test_t8n_support(fork: Fork, installed_t8n: TransitionTool) -> None:
 
     test = BlockchainTest(
         genesis_environment=env,
+        fork=fork,
         pre=pre,
         post=block_1.expected_post_state,
         blocks=[block_1, block_2],
     )
     test.generate(
         t8n=installed_t8n,
-        fork=fork,
         fixture_format=BlockchainFixture,
     )