enhance(tests): subclass Hardfork

Author: gurukamath

src/ethereum_spec_tools/forks.py

@@ -257,20 +257,6 @@ def title_case_name(self) -> str:
         """
         return self.short_name.replace("_", " ").title()
 
-    @property
-    def json_test_name(self) -> str:
-        """
-        Name of the hard fork in the test json fixtures.
-        """
-        if self.title_case_name == "Tangerine Whistle":
-            return "EIP150"
-        elif self.title_case_name == "Spurious Dragon":
-            return "EIP158"
-        elif self.title_case_name == "Constantinople":
-            return "ConstantinopleFix"
-        else:
-            return self.title_case_name
-
     def __repr__(self) -> str:
         """
         Return repr(self).

tests/json_infra/__init__.py

@@ -4,7 +4,7 @@
 
 from typing_extensions import NotRequired
 
-from ethereum_spec_tools.forks import Hardfork
+from .hardfork import TestHardfork
 
 
 class _FixtureSource(TypedDict):
@@ -33,6 +33,6 @@ class _FixtureSource(TypedDict):
 }
 
 
-FORKS: Dict[str, str] = {
-    fork.json_test_name: fork.short_name for fork in Hardfork.discover()
+FORKS: Dict[str, TestHardfork] = {
+    fork.json_test_name: fork for fork in TestHardfork.discover()
 }

tests/json_infra/conftest.py

@@ -23,9 +23,7 @@
 from requests_cache import CachedSession
 from requests_cache.backends.sqlite import SQLiteCache
 
-from ethereum_spec_tools.forks import Hardfork
-
-from . import TEST_FIXTURES
+from . import FORKS, TEST_FIXTURES
 from .helpers import FixturesFile, FixtureTestItem
 from .helpers.select_tests import extract_affected_forks
 from .stash_keys import desired_forks_key, fixture_lock
@@ -131,7 +129,7 @@ def pytest_configure(config: Config) -> None:
     file_list = config.getoption("file_list", None)
 
     desired_forks = []
-    all_forks = [fork.json_test_name for fork in Hardfork.discover()]
+    all_forks = list(FORKS.keys())
     if desired_fork:
         if desired_fork not in all_forks:
             raise ValueError(f"Unknown fork: {desired_fork}")
@@ -168,7 +166,7 @@ def pytest_configure(config: Config) -> None:
     if not any(desired_forks):
         print("No fork specific tests will be run!!!")
     else:
-        fork_list_str = " ".join(desired_forks)
+        fork_list_str = ", ".join(desired_forks)
         print(f"Running tests for the following forks: {fork_list_str}")
 
     config.stash[desired_forks_key] = desired_forks

tests/json_infra/hardfork.py

@@ -0,0 +1,31 @@
+"""
+Test-specific Hardfork subclass.
+
+Extends the base Hardfork class with test infrastructure properties.
+"""
+
+from ethereum_spec_tools.forks import Hardfork
+
+
+class TestHardfork(Hardfork):
+    """
+    Hardfork subclass with test-specific properties.
+
+    This class extends the base Hardfork class with properties needed
+    for test infrastructure, keeping test-specific concerns separated
+    from the core fork metadata.
+    """
+
+    @property
+    def json_test_name(self) -> str:
+        """
+        Name of the hard fork in the test json fixtures.
+        """
+        if self.title_case_name == "Tangerine Whistle":
+            return "EIP150"
+        elif self.title_case_name == "Spurious Dragon":
+            return "EIP158"
+        elif self.title_case_name == "Constantinople":
+            return "ConstantinopleFix"
+        else:
+            return self.title_case_name

tests/json_infra/helpers/load_blockchain_tests.py

@@ -75,7 +75,7 @@ def __init__(
         self.fork_name = self.test_dict["network"]
         self.add_marker(pytest.mark.fork(self.fork_name))
         self.add_marker("json_blockchain_tests")
-        self.eels_fork = FORKS[self.fork_name]
+        self.eels_fork = FORKS[self.fork_name].short_name
         test_patterns = exceptional_blockchain_test_patterns(
             self.fork_name, self.eels_fork
         )

tests/json_infra/helpers/load_state_tests.py

@@ -47,7 +47,7 @@ def __init__(
         self.add_marker(pytest.mark.fork(self.fork_name))
         self.add_marker("evm_tools")
         self.add_marker("json_state_tests")
-        eels_fork = FORKS[fork_name]
+        eels_fork = FORKS[fork_name].short_name
         test_patterns = exceptional_state_test_patterns(fork_name, eels_fork)
         if any(x.search(key) for x in test_patterns.slow):
             self.add_marker("slow")

tests/json_infra/test_ethash.py

@@ -44,7 +44,7 @@
 @pytest.mark.parametrize("json_fork", POW_FORKS)
 def test_ethtest_fixtures(json_fork: str) -> None:
     """Tests ethash proof-of-work validation against ethereum test fixtures."""
-    eels_fork = FORKS[json_fork]
+    eels_fork = FORKS[json_fork].short_name
     fork_module = importlib.import_module(f"ethereum.forks.{eels_fork}.fork")
 
     ethereum_tests = load_pow_test_fixtures(json_fork)
@@ -79,7 +79,7 @@ def load_pow_test_fixtures(json_fork: str) -> List[Dict[str, Any]]:
     Loads proof-of-work test fixtures for a specific fork
     from JSON files.
     """
-    eels_fork = FORKS[json_fork]
+    eels_fork = FORKS[json_fork].short_name
     header = importlib.import_module(
         f"ethereum.forks.{eels_fork}.blocks"
     ).Header
@@ -122,7 +122,7 @@ def test_pow_validation_block_headers(
     Tests proof-of-work validation on real block headers for
     specific forks.
     """
-    eels_fork = FORKS[json_fork]
+    eels_fork = FORKS[json_fork].short_name
     fork_module = importlib.import_module(f"ethereum.forks.{eels_fork}.fork")
 
     block_str_data = cast(

tests/json_infra/test_trie.py

@@ -31,7 +31,7 @@ def test_trie_secure_hex(fork: str) -> None:
     """Tests secure trie implementation with hex-encoded test data."""
     tests = load_tests("hex_encoded_securetrie_test.json")
 
-    eels_fork = FORKS[fork]
+    eels_fork = FORKS[fork].short_name
     trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie")
 
     for name, test in tests.items():
@@ -48,7 +48,7 @@ def test_trie_secure(fork: str) -> None:
     """Tests secure trie implementation with standard test data."""
     tests = load_tests("trietest_secureTrie.json")
 
-    eels_fork = FORKS[fork]
+    eels_fork = FORKS[fork].short_name
     trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie")
 
     for name, test in tests.items():
@@ -65,7 +65,7 @@ def test_trie_secure_any_order(fork: str) -> None:
     """Tests secure trie implementation with any-order test data."""
     tests = load_tests("trieanyorder_secureTrie.json")
 
-    eels_fork = FORKS[fork]
+    eels_fork = FORKS[fork].short_name
     trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie")
 
     for name, test in tests.items():
@@ -82,7 +82,7 @@ def test_trie(fork: str) -> None:
     """Tests non-secure trie implementation with standard test data."""
     tests = load_tests("trietest.json")
 
-    eels_fork = FORKS[fork]
+    eels_fork = FORKS[fork].short_name
     trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie")
 
     for name, test in tests.items():
@@ -99,7 +99,7 @@ def test_trie_any_order(fork: str) -> None:
     """Tests non-secure trie implementation with any-order test data."""
     tests = load_tests("trieanyorder.json")
 
-    eels_fork = FORKS[fork]
+    eels_fork = FORKS[fork].short_name
     trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie")
 
     for name, test in tests.items():