refactor(consume): rename & simplify consume enginex command

Author: danceratopz

src/cli/pytest_commands/consume.py

@@ -20,7 +20,7 @@ def __init__(self, command_paths: List[Path], is_hive: bool = False, command_nam
         if is_hive:
             processors.extend(
                 [
-                    HiveEnvironmentProcessor(command_name),
+                    HiveEnvironmentProcessor(command_name=command_name),
                     ConsumeCommandProcessor(is_hive=True),
                 ]
             )
@@ -49,13 +49,13 @@ def create_executions(self, pytest_args: List[str]) -> List[PytestExecution]:
         ]
 
 
-def get_command_paths(command_name: str) -> List[Path]:
+def get_command_paths(command_name: str, is_hive: bool) -> List[Path]:
     """Determine the command paths based on the command name and hive flag."""
     base_path = Path("src/pytest_plugins/consume")
     if command_name == "hive":
         commands = ["rlp", "engine"]
         command_paths = [base_path / "simulators" / cmd / f"test_via_{cmd}.py" for cmd in commands]
-    elif command_name in ["engine", "engine-reorg", "engine_reorg"]:
+    elif command_name in ["engine", "enginex"]:
         command_paths = [base_path / "simulators" / "hive_tests" / "test_via_engine.py"]
     elif command_name == "rlp":
         command_paths = [base_path / "simulators" / "hive_tests" / "test_via_rlp.py"]
@@ -78,7 +78,7 @@ def consume_command(is_hive: bool = False) -> Callable[[Callable[..., Any]], cli
     def decorator(func: Callable[..., Any]) -> click.Command:
         command_name = func.__name__
         command_help = func.__doc__
-        command_paths = get_command_paths(command_name)
+        command_paths = get_command_paths(command_name, is_hive)
 
         @consume.command(
             name=command_name,
@@ -110,24 +110,14 @@ 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(
-    name="engine-reorg",
-    help="Client consumes via the Engine API with reorg fixtures.",
-    context_settings={"ignore_unknown_options": True},
-)
-@common_pytest_options
-def engine_reorg(
-    pytest_args: List[str], help_flag: bool = False, pytest_help_flag: bool = False
-) -> None:
-    """Client consumes via the Engine API with reorg fixtures."""
-    command_name = "engine_reorg"  # Use underscore for internal logic
-    command_paths = get_command_paths(command_name)
-    consume_cmd = ConsumeCommand(command_paths, is_hive=True, command_name=command_name)
-    consume_cmd.execute(list(pytest_args))
+@consume_command(is_hive=True)
+def enginex() -> None:
+    """Client consumes Engine X Fixtures via the Engine API."""
+    pass
 
 
 @consume_command(is_hive=True)
@@ -140,7 +130,7 @@ def hive() -> None:
     context_settings={"ignore_unknown_options": True},
 )
 @common_pytest_options
-def cache(pytest_args: List[str], help_flag: bool = False, pytest_help_flag: bool = False) -> None:
+def cache(pytest_args: List[str], **kwargs) -> None:
     """Consume command to cache test fixtures."""
-    cache_cmd = ConsumeCommand([], is_hive=False, command_name="cache")
+    cache_cmd = ConsumeCommand([], is_hive=False)
     cache_cmd.execute(list(pytest_args))

src/cli/pytest_commands/processors.py

@@ -74,7 +74,7 @@ def _is_writing_to_stdout(self, args: List[str]) -> bool:
 class HiveEnvironmentProcessor(ArgumentProcessor):
     """Processes Hive environment variables for consume commands."""
 
-    def __init__(self, command_name: str = ""):
+    def __init__(self, command_name: str):
         """
         Initialize the processor with command name to determine plugin.
 
@@ -106,7 +106,7 @@ 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 == "engine_reorg":
+        elif self.command_name == "enginex":
             modified_args.extend(["-p", "pytest_plugins.consume.simulators.engine_reorg.conftest"])
         elif self.command_name == "rlp":
             modified_args.extend(["-p", "pytest_plugins.consume.simulators.rlp.conftest"])

whitelist.txt

@@ -1061,6 +1061,7 @@ Typechecking
 groupstats
 SharedPreStateGroup
 zkEVMs
+enginex
 qube
 aspell
 codespell