fix(consume): update according to renaming in #1760

Author: danceratopz

src/pytest_plugins/consume/simulators/engine_reorg/conftest.py

@@ -1,14 +1,14 @@
 """
 Pytest fixtures for the `consume engine-reorg` simulator.
 
-Configures the hive back-end & EL clients for test execution with BlockchainEngineReorgFixtures.
+Configures the hive back-end & EL clients for test execution with BlockchainEngineXFixtures.
 """
 
 import pytest
 from hive.client import Client
 
 from ethereum_test_exceptions import ExceptionMapper
-# Note: BlockchainEngineReorgFixture import removed as it may not exist at this commit
+from ethereum_test_fixtures import BlockchainEngineXFixture
 from ethereum_test_rpc import EngineRPC
 
 pytest_plugins = (
@@ -22,7 +22,7 @@
 
 def pytest_configure(config):
     """Set the supported fixture formats for the engine simulator."""
-    config._supported_fixture_formats = [BlockchainEngineReorgFixture.format_name]
+    config._supported_fixture_formats = [BlockchainEngineXFixture.format_name]
 
 
 @pytest.fixture(scope="module")

src/pytest_plugins/consume/simulators/helpers/client_wrapper.py

@@ -11,7 +11,7 @@
 
 from ethereum_test_base_types import Number, to_json
 from ethereum_test_fixtures import BlockchainFixtureCommon
-# Note: SharedPreStateGroup import removed as shared_alloc module may not exist at this commit
+from ethereum_test_fixtures.pre_alloc_groups import PreAllocGroup
 from ethereum_test_forks import Fork
 from pytest_plugins.consume.simulators.helpers.ruleset import ruleset
 
@@ -203,7 +203,7 @@ def __init__(
         self,
         pre_hash: str,
         client_type: ClientType,
-        shared_pre_state: SharedPreStateGroup,
+        shared_pre_state: PreAllocGroup,
     ):
         """
         Initialize a reorg client wrapper.
@@ -296,15 +296,15 @@ def set_pre_alloc_path(self, path: Path) -> None:
         self.pre_alloc_path = path
         logger.debug(f"Pre-alloc path set to: {path}")
 
-    def load_shared_pre_state(self, pre_hash: str) -> SharedPreStateGroup:
+    def load_shared_pre_state(self, pre_hash: str) -> PreAllocGroup:
         """
         Load the shared pre-state for a given preHash.
 
         Args:
             pre_hash: The hash identifying the pre-allocation group
 
         Returns:
-            The loaded SharedPreStateGroup
+            The loaded PreAllocGroup
 
         Raises:
             RuntimeError: If pre-alloc path is not set
@@ -318,7 +318,7 @@ def load_shared_pre_state(self, pre_hash: str) -> SharedPreStateGroup:
         if not pre_alloc_file.exists():
             raise FileNotFoundError(f"Pre-allocation file not found: {pre_alloc_file}")
 
-        return SharedPreStateGroup.model_validate_json(pre_alloc_file.read_text())
+        return PreAllocGroup.model_validate_json(pre_alloc_file.read_text())
 
     def get_or_create_reorg_client(
         self,

src/pytest_plugins/consume/simulators/multi_test_client.py

@@ -10,7 +10,9 @@
 from hive.testing import HiveTestSuite
 
 from ethereum_test_base_types import to_json
+from ethereum_test_fixtures import BlockchainEngineXFixture
 from ethereum_test_fixtures.blockchain import FixtureHeader
+from ethereum_test_fixtures.pre_alloc_groups import PreAllocGroup
 from pytest_plugins.consume.consume import FixturesSource
 from pytest_plugins.consume.simulators.helpers.ruleset import (
     ruleset,  # TODO: generate dynamically
@@ -24,17 +26,17 @@
 
 
 @pytest.fixture(scope="session")
-def shared_pre_state_cache() -> Dict[str, SharedPreStateGroup]:
+def shared_pre_state_cache() -> Dict[str, PreAllocGroup]:
     """Cache for shared pre-state groups to avoid reloading from disk."""
     return {}
 
 
 @pytest.fixture(scope="function")
 def shared_pre_state_group(
-    fixture: BlockchainEngineReorgFixture,
+    fixture: BlockchainEngineXFixture,
     fixtures_source: FixturesSource,
-    shared_pre_state_cache: Dict[str, SharedPreStateGroup],
-) -> SharedPreStateGroup:
+    shared_pre_state_cache: Dict[str, PreAllocGroup],
+) -> PreAllocGroup:
     """Load the shared pre-state group for the current test case."""
     pre_hash = fixture.pre_hash
 
@@ -48,20 +50,20 @@ def shared_pre_state_group(
 
     # Look for shared pre-allocation file using FixtureOutput path structure
     fixture_output = FixtureOutput(output_path=fixtures_source.path)
-    shared_alloc_path = fixture_output.shared_pre_alloc_folder_path / f"{pre_hash}.json"
+    shared_alloc_path = fixture_output.pre_alloc_groups_folder_path / f"{pre_hash}.json"
     if not shared_alloc_path.exists():
         raise FileNotFoundError(f"Shared pre-allocation file not found: {shared_alloc_path}")
 
     # Load and cache
     with open(shared_alloc_path) as f:
-        shared_group = SharedPreStateGroup.model_validate_json(f.read())
+        shared_group = PreAllocGroup.model_validate_json(f.read())
 
     shared_pre_state_cache[pre_hash] = shared_group
     return shared_group
 
 
-def create_environment(shared_pre_state_group: SharedPreStateGroup, check_live_port: int) -> dict:
-    """Define environment using SharedPreStateGroup data."""
+def create_environment(shared_pre_state_group: PreAllocGroup, check_live_port: int) -> dict:
+    """Define environment using PreAllocGroup data."""
     fork = shared_pre_state_group.fork
     assert fork in ruleset, f"fork '{fork}' missing in hive ruleset"
     return {
@@ -73,7 +75,7 @@ def create_environment(shared_pre_state_group: SharedPreStateGroup, check_live_p
     }
 
 
-def client_files(shared_pre_state_group: SharedPreStateGroup) -> Mapping[str, io.BufferedReader]:
+def client_files(shared_pre_state_group: PreAllocGroup) -> Mapping[str, io.BufferedReader]:
     """Define the files that hive will start the client with."""
     genesis = to_json(shared_pre_state_group.genesis)  # type: ignore
     alloc = to_json(shared_pre_state_group.pre)
@@ -103,7 +105,7 @@ def reorg_client_manager() -> Generator[ReorgClientManager, None, None]:
 
 
 @pytest.fixture(scope="function")
-def genesis_header(shared_pre_state_group: SharedPreStateGroup) -> FixtureHeader:
+def genesis_header(shared_pre_state_group: PreAllocGroup) -> FixtureHeader:
     """Provide the genesis header from the shared pre-state group."""
     return shared_pre_state_group.genesis  # type: ignore
 
@@ -113,8 +115,8 @@ def client(
     test_suite: HiveTestSuite,
     client_type: ClientType,
     total_timing_data: TimingData,
-    fixture: BlockchainEngineReorgFixture,
-    shared_pre_state_group: SharedPreStateGroup,
+    fixture: BlockchainEngineXFixture,
+    shared_pre_state_group: PreAllocGroup,
     reorg_client_manager: ReorgClientManager,
     fixtures_source: FixturesSource,
 ) -> Generator[Client, None, None]:
@@ -125,7 +127,7 @@ def client(
     # Set pre-alloc path in manager if not already set
     if reorg_client_manager.pre_alloc_path is None:
         fixture_output = FixtureOutput(output_path=fixtures_source.path)
-        reorg_client_manager.set_pre_alloc_path(fixture_output.shared_pre_alloc_folder_path)
+        reorg_client_manager.set_pre_alloc_path(fixture_output.pre_alloc_groups_folder_path)
 
     # Check for existing client
     existing_client = reorg_client_manager.get_client_for_test(pre_hash)

src/pytest_plugins/consume/simulators/simulator_logic/test_via_engine.py

@@ -8,7 +8,7 @@
 import time
 
 from ethereum_test_exceptions import UndefinedException
-from ethereum_test_fixtures import BlockchainEngineFixture
+from ethereum_test_fixtures import BlockchainEngineFixture, BlockchainEngineXFixture
 from ethereum_test_fixtures.blockchain import FixtureHeader
 from ethereum_test_rpc import EngineRPC, EthRPC
 from ethereum_test_rpc.types import ForkchoiceState, JSONRPCError, PayloadStatusEnum
@@ -33,7 +33,7 @@ def test_blockchain_via_engine(
     timing_data: TimingData,
     eth_rpc: EthRPC,
     engine_rpc: EngineRPC,
-    fixture: BlockchainEngineFixture,
+    fixture: BlockchainEngineFixture | BlockchainEngineXFixture,
     genesis_header: FixtureHeader,
     strict_exception_matching: bool,
 ):