diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 91e223f36a8..1bf5a45492b 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -92,6 +92,7 @@ Users can select any of the artifacts depending on their testing needs for their - 🔀 Refactor consume simulator architecture to use explicit pytest plugin structure with forward-looking architecture ([#1801](https://github.com/ethereum/execution-spec-tests/pull/1801)). - 🔀 Add exponential retry logic to initial fcu within consume engine ([#1815](https://github.com/ethereum/execution-spec-tests/pull/1815)). - ✨ Add `consume sync` command to test client synchronization capabilities by having one client sync from another via Engine API and P2P networking ([#2007](https://github.com/ethereum/execution-spec-tests/pull/2007)). +- 💥 Removed the `consume hive` command, this was a convenience command that ran `consume rlp` and `consume engine` in one pytest session; the individual commands should now be used instead ([#2008](https://github.com/ethereum/execution-spec-tests/pull/2008)). #### `execute` diff --git a/src/cli/pytest_commands/consume.py b/src/cli/pytest_commands/consume.py index e3736ddf442..bf4d6620001 100644 --- a/src/cli/pytest_commands/consume.py +++ b/src/cli/pytest_commands/consume.py @@ -39,12 +39,7 @@ def create_consume_command( def get_command_logic_test_paths(command_name: str, is_hive: bool) -> List[Path]: """Determine the command paths based on the command name and hive flag.""" base_path = Path("pytest_plugins/consume") - if command_name == "hive": - commands = ["rlp", "engine"] - command_logic_test_paths = [ - base_path / "simulators" / "simulator_logic" / f"test_via_{cmd}.py" for cmd in commands - ] - elif command_name in ["engine", "rlp"]: + if command_name in ["engine", "rlp"]: command_logic_test_paths = [ base_path / "simulators" / "simulator_logic" / f"test_via_{command_name}.py" ] @@ -117,12 +112,6 @@ def sync() -> None: pass -@consume_command(is_hive=True) -def hive() -> None: - """Client consumes via all available hive methods (rlp, engine).""" - pass - - @consume.command( context_settings={"ignore_unknown_options": True}, ) diff --git a/src/pytest_plugins/help/tests/test_help.py b/src/pytest_plugins/help/tests/test_help.py index 0b865a2a8c9..9b7b45ae6c8 100644 --- a/src/pytest_plugins/help/tests/test_help.py +++ b/src/pytest_plugins/help/tests/test_help.py @@ -40,7 +40,6 @@ def test_local_arguments_present_in_fill_help(pytester, help_flag): ("direct", "--consume-help"), ("rlp", "--consume-help"), ("engine", "--consume-help"), - ("hive", "--consume-help"), ], ) def test_local_arguments_present_in_base_consume_help(pytester, help_flag, command):