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

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

* chore(docs): update changelog.

* Update src/ethereum_test_forks/helpers.py

Co-authored-by: danceratopz <[email protected]>

* Update src/ethereum_test_forks/helpers.py

Co-authored-by: danceratopz <[email protected]>

* chore(fill): add review comments.

---------

Co-authored-by: danceratopz <[email protected]>

Author: spencer-tb

docs/CHANGELOG.md

@@ -21,6 +21,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 #### `fill`
 
 - 🐞 Fix `--fork/from/until` for transition forks when using `fill` [#1311](https://github.com/ethereum/execution-spec-tests/pull/1311).
+- 🐞 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

@@ -41,6 +41,8 @@
     get_from_until_fork_set,
     get_last_descendants,
     get_relative_fork_markers,
+    get_transition_fork_predecessor,
+    get_transition_fork_successor,
     get_transition_forks,
     transition_fork_from_to,
     transition_fork_to,
@@ -76,6 +78,8 @@
     "get_closest_fork_with_solc_support",
     "get_deployed_forks",
     "get_development_forks",
+    "get_transition_fork_predecessor",
+    "get_transition_fork_successor",
     "get_forks_with_no_descendants",
     "get_forks_with_no_parents",
     "get_forks_with_solc_support",

src/ethereum_test_forks/helpers.py

@@ -10,10 +10,7 @@
 
 
 class InvalidForkError(Exception):
-    """
-    Invalid fork error raised when the fork specified by command-line option
-    --latest-fork is not found.
-    """
+    """Invalid fork error raised when the fork specified is not found or incompatible."""
 
     def __init__(self, message):
         """Initialize the InvalidForkError exception."""
@@ -56,7 +53,7 @@ def get_parent_fork(fork: Fork) -> Fork:
     """Return parent fork of the specified fork."""
     parent_fork = fork.__base__
     if not parent_fork:
-        raise Exception(f"Parent fork of {fork} not found.")
+        raise InvalidForkError(f"Parent fork of {fork} not found.")
     return parent_fork
 
 
@@ -98,6 +95,20 @@ def get_transition_forks() -> Set[Fork]:
     return transition_forks
 
 
+def get_transition_fork_predecessor(transition_fork: Fork) -> Fork:
+    """Return the fork from which the transition fork transitions."""
+    if not issubclass(transition_fork, TransitionBaseClass):
+        raise InvalidForkError(f"{transition_fork} is not a transition fork.")
+    return transition_fork.transitions_from()
+
+
+def get_transition_fork_successor(transition_fork: Fork) -> Fork:
+    """Return the fork to which the transition fork transitions."""
+    if not issubclass(transition_fork, TransitionBaseClass):
+        raise InvalidForkError(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]:
@@ -225,7 +236,7 @@ def get_relative_fork_markers(fork_identifier: Fork | str) -> list[str]:
                 fork_class = candidate
                 break
         if fork_class is None:
-            raise Exception(f"Unknown fork: {fork_identifier}")
+            raise InvalidForkError(f"Unknown fork: {fork_identifier}")
     else:
         fork_class = fork_identifier
 

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_transition_fork_predecessor, 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_transition_fork_predecessor(fork)
+                item._nodeid = item._nodeid.replace(
+                    f"fork_{fork.name()}",
+                    f"fork_{base_fork.name()}",
+                )
+
 
 def pytest_sessionfinish(session: pytest.Session, exitstatus: int):
     """