fix(tests): Don't cache fixtures

Author: marioevz

tests/json_infra/helpers/fixtures.py

@@ -18,20 +18,17 @@ class Fixture(ABC):
 
     test_file: str
     test_key: str
-    test_dict: Dict[str, Any]
 
     def __init__(
         self,
         *args: Any,
         test_file: str,
         test_key: str,
-        test_dict: Dict[str, Any],
         **kwargs: Any,
     ):
         super().__init__(*args, **kwargs)
         self.test_file = test_file
         self.test_key = test_key
-        self.test_dict = test_dict
 
     @classmethod
     def from_parent(

tests/json_infra/helpers/load_blockchain_tests.py

@@ -1,6 +1,7 @@
 """Helpers to load and run blockchain tests from JSON files."""
 
 import importlib
+import json
 from pathlib import Path
 from typing import Any, Dict, Tuple
 from unittest.mock import call, patch
@@ -67,11 +68,12 @@ class BlockchainTestFixture(Fixture, Item):
     def __init__(
         self,
         *args: Any,
+        test_dict: Dict[str, Any],
         **kwargs: Any,
     ) -> None:
         """Initialize a single blockchain test fixture from a JSON file."""
         super().__init__(*args, **kwargs)
-        self.fork_name = self.test_dict["network"]
+        self.fork_name = test_dict["network"]
         self.add_marker(pytest.mark.fork(self.fork_name))
         self.add_marker("evm_tools")
         self.add_marker("json_blockchain_tests")
@@ -91,9 +93,15 @@ def __init__(
         if any(x.search(_identifier) for x in test_patterns.big_memory):
             self.add_marker("bigmem")
 
+    def test_dict(self) -> Dict[str, Any]:
+        """Load test from disk."""
+        with open(self.test_file, "r") as file:
+            loaded_file = json.load(file)
+            return loaded_file[self.test_key]
+
     def runtest(self) -> None:
         """Run a blockchain state test from JSON test case data."""
-        json_data = self.test_dict
+        json_data = self.test_dict()
         if "postState" not in json_data:
             pytest.xfail(
                 f"{self.test_file}[{self.test_key}] doesn't have post state"

tests/json_infra/helpers/load_state_tests.py

@@ -28,19 +28,16 @@ class StateTest(Item):
     """Single state test case item."""
 
     test_case: TestCase
-    test_dict: Dict[str, Any]
 
     def __init__(
         self,
         *args: Any,
         test_case: TestCase,
-        test_dict: Dict[str, Any],
         **kwargs: Any,
     ) -> None:
         """Initialize a single test case item."""
         super().__init__(*args, **kwargs)
         self.test_case = test_case
-        self.test_dict = test_dict
         self.add_marker(pytest.mark.fork(self.test_case.fork_name))
         self.add_marker("evm_tools")
         self.add_marker("json_state_tests")
@@ -51,13 +48,19 @@ def __init__(
         if any(x.search(test_case.key) for x in test_patterns.slow):
             self.add_marker("slow")
 
+    def test_dict(self) -> Dict[str, Any]:
+        """Load test from disk."""
+        with open(self.test_case.path, "r") as file:
+            loaded_file = json.load(file)
+            return loaded_file[self.test_case.key]
+
     def runtest(self) -> None:
         """
         Runs a single general state test.
         """
         index = self.test_case.index
         json_fork = self.test_case.fork_name
-        test_dict = self.test_dict
+        test_dict = self.test_dict()
 
         env = test_dict["env"]
         try:
@@ -131,6 +134,19 @@ class StateTestFixture(Fixture, Collector):
     cases.
     """
 
+    _test_dict: Dict[str, Any] | None
+
+    def __init__(
+        self,
+        *args: Any,
+        test_dict: Dict[str, Any],
+        **kwargs: Any,
+    ) -> None:
+        """Initialize a single blockchain test fixture from a JSON file."""
+        super().__init__(*args, **kwargs)
+        # Save for collection purposes only, then free.
+        self._test_dict = test_dict
+
     @classmethod
     def is_format(cls, test_dict: Dict[str, Any]) -> bool:
         """Return true if the object can be parsed as the fixture type."""
@@ -146,10 +162,12 @@ def is_format(cls, test_dict: Dict[str, Any]) -> bool:
 
     def collect(self) -> Iterable[Item | Collector]:
         """Collect state test cases inside of this fixture."""
+        assert self._test_dict is not None
+        test_dict, self._test_dict = self._test_dict, None
         for test_case in read_test_case(
             test_file_path=self.test_file,
             key=self.test_key,
-            test=self.test_dict,
+            test=test_dict,
         ):
             if test_case.fork_name not in FORKS:
                 continue
@@ -158,5 +176,4 @@ def collect(self) -> Iterable[Item | Collector]:
                 parent=self,
                 name=name,
                 test_case=test_case,
-                test_dict=self.test_dict,
             )