chore(fill): fix transition fork state test node ids.

Author: spencer-tb

src/ethereum_test_forks/transition_base_fork.py

@@ -49,6 +49,10 @@ class NewTransitionClass(
             def transitions_to(cls) -> Fork:
                 return to_fork
 
+            @classmethod
+            def transitions_from(cls) -> Fork:
+                return from_fork
+
         NewTransitionClass.name = lambda: transition_name  # type: ignore
 
         def make_transition_method(

src/pytest_plugins/filler/filler.py

@@ -9,6 +9,7 @@
 import configparser
 import datetime
 import os
+import re
 import tarfile
 import warnings
 from pathlib import Path
@@ -25,7 +26,7 @@
 from ethereum_clis.clis.geth import FixtureConsumerTool
 from ethereum_test_base_types import Alloc, ReferenceSpec
 from ethereum_test_fixtures import BaseFixture, FixtureCollector, FixtureConsumer, TestInfo
-from ethereum_test_forks import Fork
+from ethereum_test_forks import Fork, get_transition_forks
 from ethereum_test_specs import SPEC_TYPES, BaseTest
 from ethereum_test_tools.utility.versioning import (
     generate_github_url,
@@ -753,7 +754,9 @@ def pytest_collection_modifyitems(config: pytest.Config, items: List[pytest.Item
     Remove pre-Paris tests parametrized to generate hive type fixtures; these
     can't be used in the Hive Pyspec Simulator.
 
-    This can't be handled in this plugins pytest_generate_tests() as the fork
+    Replaces the test ID for state tests that use a transition fork with the base fork.
+
+    These can't be handled in this plugins pytest_generate_tests() as the fork
     parametrization occurs in the forks plugin.
     """
     for item in items[:]:  # use a copy of the list, as we'll be modifying it
@@ -780,6 +783,19 @@ def pytest_collection_modifyitems(config: pytest.Config, items: List[pytest.Item
         if "yul" in item.fixturenames:  # type: ignore
             item.add_marker(pytest.mark.yul_test)
 
+        # Update test ID for state tests that use a transition fork
+        if fork in get_transition_forks():
+            has_state_test = any(marker.name == "state_test" for marker in markers)
+            has_valid_transition = any(
+                marker.name == "valid_at_transition_to" for marker in markers
+            )
+            if has_state_test and has_valid_transition:
+                base_fork = fork.transitions_from()
+                item._nodeid = item._nodeid.replace(
+                    f"fork_{fork.name()}",
+                    f"fork_{base_fork.name()}",
+                )
+
 
 def pytest_sessionfinish(session: pytest.Session, exitstatus: int):
     """