feat(consume): add initial implementation of consume enginex

Also removes a file that was unintentionally added in #1718.

Author: danceratopz

src/cli/pytest_commands/consume.py

@@ -44,9 +44,13 @@ def get_command_logic_test_paths(command_name: str, is_hive: bool) -> List[Path]
         command_logic_test_paths = [
             base_path / "simulators" / "simulator_logic" / f"test_via_{cmd}.py" for cmd in commands
         ]
-    elif command_name in ["engine", "rlp"]:
+    elif command_name in ["engine", "enginex"]:
         command_logic_test_paths = [
-            base_path / "simulators" / "simulator_logic" / f"test_via_{command_name}.py"
+            base_path / "simulators" / "simulator_logic" / "test_via_engine.py"
+        ]
+    elif command_name == "rlp":
+        command_logic_test_paths = [
+            base_path / "simulators" / "simulator_logic" / "test_via_rlp.py"
         ]
     elif command_name == "direct":
         command_logic_test_paths = [base_path / "direct" / "test_via_direct.py"]
@@ -103,13 +107,19 @@ def rlp() -> None:
 
 @consume_command(is_hive=True)
 def engine() -> None:
-    """Client consumes via the Engine API."""
+    """Client consumes Engine Fixtures via the Engine API."""
+    pass
+
+
+@consume_command(is_hive=True)
+def enginex() -> None:
+    """Client consumes Engine X Fixtures via the Engine API."""
     pass
 
 
 @consume_command(is_hive=True)
 def hive() -> None:
-    """Client consumes via all available hive methods (rlp, engine)."""
+    """Client consumes via rlp & engine hive methods."""
     pass
 
 

src/cli/pytest_commands/processors.py

@@ -101,6 +101,12 @@ def process_args(self, args: List[str]) -> List[str]:
 
         if self.command_name == "engine":
             modified_args.extend(["-p", "pytest_plugins.consume.simulators.engine.conftest"])
+        elif self.command_name == "enginex":
+            modified_args.extend(["-p", "pytest_plugins.consume.simulators.enginex.conftest"])
+            if (
+                self._has_parallelism_flag(args) or "-n" in modified_args
+            ) and "--dist" not in modified_args:
+                modified_args.extend(["--dist=loadgroup"])
         elif self.command_name == "rlp":
             modified_args.extend(["-p", "pytest_plugins.consume.simulators.rlp.conftest"])
         else:

src/pytest_plugins/consume/consume.py

@@ -495,11 +495,18 @@ def pytest_generate_tests(metafunc):
         if test_case.format.format_name not in metafunc.config._supported_fixture_formats:
             continue
         fork_markers = get_relative_fork_markers(test_case.fork, strict_mode=False)
+
+        # Append pre_hash (first 8 chars) to test ID for easier selection with --sim.limit
+        test_id = test_case.id
+        if hasattr(test_case, "pre_hash") and test_case.pre_hash:
+            test_id = f"{test_case.id}[{test_case.pre_hash[:8]}]"
+
         param = pytest.param(
             test_case,
-            id=test_case.id,
+            id=test_id,
             marks=[getattr(pytest.mark, m) for m in fork_markers]
-            + [getattr(pytest.mark, test_case.format.format_name)],
+            + [getattr(pytest.mark, test_case.format.format_name)]
+            + [pytest.mark.xdist_group(name=test_case.pre_hash)],
         )
         param_list.append(param)
 

src/pytest_plugins/consume/hive_engine_test/__init__.py

@@ -1 +1 @@
-"""Consume Engine test functions."""
+"""The consume engine simulator."""

src/pytest_plugins/consume/hive_simulators_reorg/__init__.py

@@ -1,8 +1,4 @@
-"""
-Pytest fixtures for the `consume engine` simulator.
-
-Configures the hive back-end & EL clients for each individual test execution.
-"""
+"""Pytest plugin for the `consume engine` simulator."""
 
 import io
 from typing import Mapping
@@ -29,6 +25,18 @@ def pytest_configure(config):
     config._supported_fixture_formats = [BlockchainEngineFixture.format_name]
 
 
+@pytest.fixture(scope="module")
+def test_suite_name() -> str:
+    """The name of the hive test suite used in this simulator."""
+    return "eest/consume-engine"
+
+
+@pytest.fixture(scope="module")
+def test_suite_description() -> str:
+    """The description of the hive test suite used in this simulator."""
+    return "Execute blockchain tests against clients using the Engine API."
+
+
 @pytest.fixture(scope="function")
 def engine_rpc(client: Client, client_exception_mapper: ExceptionMapper | None) -> EngineRPC:
     """Initialize engine RPC client for the execution client under test."""
@@ -42,18 +50,6 @@ def engine_rpc(client: Client, client_exception_mapper: ExceptionMapper | None)
     return EngineRPC(f"http://{client.ip}:8551")
 
 
-@pytest.fixture(scope="module")
-def test_suite_name() -> str:
-    """The name of the hive test suite used in this simulator."""
-    return "eest/consume-engine"
-
-
-@pytest.fixture(scope="module")
-def test_suite_description() -> str:
-    """The description of the hive test suite used in this simulator."""
-    return "Execute blockchain tests against clients using the Engine API."
-
-
 @pytest.fixture(scope="function")
 def client_files(buffered_genesis: io.BufferedReader) -> Mapping[str, io.BufferedReader]:
     """Define the files that hive will start the client with."""

src/pytest_plugins/consume/simulators/engine/__init__.py

@@ -0,0 +1 @@
+"""The consume enginex simulator."""

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

@@ -0,0 +1,54 @@
+"""
+Pytest fixtures for the `consume enginex` simulator.
+
+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
+from ethereum_test_fixtures import BlockchainEngineXFixture
+from ethereum_test_rpc import EngineRPC
+
+pytest_plugins = (
+    "pytest_plugins.pytest_hive.pytest_hive",
+    "pytest_plugins.consume.simulators.base",
+    "pytest_plugins.consume.simulators.multi_test_client",
+    "pytest_plugins.consume.simulators.test_case_description",
+    "pytest_plugins.consume.simulators.timing_data",
+    "pytest_plugins.consume.simulators.exceptions",
+)
+
+
+def pytest_configure(config):
+    """Set the supported fixture formats for the engine simulator."""
+    config._supported_fixture_formats = [BlockchainEngineXFixture.format_name]
+
+
+@pytest.fixture(scope="module")
+def test_suite_name() -> str:
+    """The name of the hive test suite used in this simulator."""
+    return "eest/consume-enginex"
+
+
+@pytest.fixture(scope="module")
+def test_suite_description() -> str:
+    """The description of the hive test suite used in this simulator."""
+    return (
+        "Execute blockchain tests against clients using the Engine API with "
+        "pre-allocation group optimization using Engine X fixtures."
+    )
+
+
+@pytest.fixture(scope="function")
+def engine_rpc(client: Client, client_exception_mapper: ExceptionMapper | None) -> EngineRPC:
+    """Initialize engine RPC client for the execution client under test."""
+    if client_exception_mapper:
+        return EngineRPC(
+            f"http://{client.ip}:8551",
+            response_validation_context={
+                "exception_mapper": client_exception_mapper,
+            },
+        )
+    return EngineRPC(f"http://{client.ip}:8551")