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

Author: spencer-tb

docs/CHANGELOG.md

@@ -15,6 +15,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ Add support for Nethermind's `nethtest` command to `consume direct` ([#1250](https://github.com/ethereum/execution-spec-tests/pull/1250)).
 - ✨ Allow filtering of test cases by fork via pytest marks (via, e.g., `-m "Cancun or Prague"`) ([#1304](https://github.com/ethereum/execution-spec-tests/pull/1304)).
 - 🐞 Improve index generation of ethereum/tests fixtures: Allow generation at any directory level and include `generatedTestHash` in the index file for the `fixture_hash` ([#1303](https://github.com/ethereum/execution-spec-tests/pull/1303)).
+- 🐞 Fix the node id for state tests marked by transition forks ([#1313](https://github.com/ethereum/execution-spec-tests/pull/1313)).
 
 ### 📋 Misc
 

src/ethereum_test_forks/__init__.py

@@ -33,6 +33,8 @@
     get_closest_fork_with_solc_support,
     get_deployed_forks,
     get_development_forks,
+    get_fork_from_transition_fork,
+    get_fork_to_transition_fork,
     get_forks,
     get_forks_with_no_descendants,
     get_forks_with_no_parents,
@@ -76,6 +78,8 @@
     "get_closest_fork_with_solc_support",
     "get_deployed_forks",
     "get_development_forks",
+    "get_fork_from_transition_fork",
+    "get_fork_to_transition_fork",
     "get_forks_with_no_descendants",
     "get_forks_with_no_parents",
     "get_forks_with_solc_support",

src/ethereum_test_forks/helpers.py

@@ -98,6 +98,20 @@ def get_transition_forks() -> Set[Fork]:
     return transition_forks
 
 
+def get_fork_from_transition_fork(transition_fork: Fork) -> Fork:
+    """Return the fork from which the transition fork transitions."""
+    if not issubclass(transition_fork, TransitionBaseClass):
+        raise Exception(f"{transition_fork} is not a transition fork.")
+    return transition_fork.transitions_from()
+
+
+def get_fork_to_transition_fork(transition_fork: Fork) -> Fork:
+    """Return the fork to which the transition fork transitions."""
+    if not issubclass(transition_fork, TransitionBaseClass):
+        raise Exception(f"{transition_fork} is not a transition fork.")
+    return transition_fork.transitions_to()
+
+
 def get_from_until_fork_set(
     forks: Set[Fork], forks_from: Set[Fork], forks_until: Set[Fork]
 ) -> Set[Fork]:

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

@@ -25,7 +25,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_fork_from_transition_fork, get_transition_forks
 from ethereum_test_specs import SPEC_TYPES, BaseTest
 from ethereum_test_tools.utility.versioning import (
     generate_github_url,
@@ -753,7 +753,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 +782,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 = get_fork_from_transition_fork(fork)
+                item._nodeid = item._nodeid.replace(
+                    f"fork_{fork.name()}",
+                    f"fork_{base_fork.name()}",
+                )
+
 
 def pytest_sessionfinish(session: pytest.Session, exitstatus: int):
     """