ethereum · kclowes · Sep 15, 2025
diff --git a/docs/library/cli/eest.md b/docs/library/cli/eest.md
@@ -1,7 +1,7 @@
 # The `eest` CLI
 
 ::: mkdocs-click
-    :module: cli.eest.cli
+    :module: ethereum_test_cli.eest.cli
     :command: eest
     :depth: 1
     :list_subcommands: true
diff --git a/docs/library/cli/evm_bytes.md b/docs/library/cli/evm_bytes.md
@@ -1,7 +1,7 @@
 # The `evm_bytes` CLI
 
 ::: mkdocs-click
-    :module: cli.evm_bytes
+    :module: ethereum_test_cli.evm_bytes
     :command: evm_bytes
     :depth: 1
     :list_subcommands: true
diff --git a/docs/scripts/gen_test_case_reference.py b/docs/scripts/gen_test_case_reference.py
@@ -15,8 +15,8 @@
 from click.testing import CliRunner
 
 import pytest_plugins.filler.gen_test_doc.gen_test_doc as gen_test_doc
-from cli.pytest_commands.fill import fill
 from config import DocsConfig
+from ethereum_test_cli.pytest_commands.fill import fill
 
 importlib.reload(gen_test_doc)  # get changes in plugin to trigger an update for `mkdocs serve`
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -83,30 +83,30 @@ docs = [
 ]
 
 [project.scripts]
-fill = "cli.pytest_commands.fill:fill"
-phil = "cli.pytest_commands.fill:phil"
-execute = "cli.pytest_commands.execute:execute"
-attac = "cli.pytest_commands.execute:execute"
-checkfixtures = "cli.check_fixtures:check_fixtures"
-check_eip_versions = "cli.pytest_commands.check_eip_versions:check_eip_versions"
-consume = "cli.pytest_commands.consume:consume"
-protec = "cli.pytest_commands.consume:consume"
-checklist = "cli.pytest_commands.checklist:checklist"
-generate_checklist_stubs = "cli.generate_checklist_stubs:generate_checklist_stubs"
-genindex = "cli.gen_index:generate_fixtures_index_cli"
-gentest = "cli.gentest:generate"
-eofwrap = "cli.eofwrap:eof_wrap"
-pyspelling_soft_fail = "cli.tox_helpers:pyspelling"
-markdownlintcli2_soft_fail = "cli.tox_helpers:markdownlint"
-order_fixtures = "cli.order_fixtures:order_fixtures"
-evm_bytes = "cli.evm_bytes:evm_bytes"
-hasher = "cli.hasher:main"
-eest = "cli.eest.cli:eest"
-fillerconvert = "cli.fillerconvert.fillerconvert:main"
-groupstats = "cli.show_pre_alloc_group_stats:main"
-extract_config = "cli.extract_config:extract_config"
-compare_fixtures = "cli.compare_fixtures:main"
-modify_static_test_gas_limits = "cli.modify_static_test_gas_limits:main"
+fill = "ethereum_test_cli.pytest_commands.fill:fill"
+phil = "ethereum_test_cli.pytest_commands.fill:phil"
+execute = "ethereum_test_cli.pytest_commands.execute:execute"
+attac = "ethereum_test_cli.pytest_commands.execute:execute"
+checkfixtures = "ethereum_test_cli.check_fixtures:check_fixtures"
+check_eip_versions = "ethereum_test_cli.pytest_commands.check_eip_versions:check_eip_versions"
+consume = "ethereum_test_cli.pytest_commands.consume:consume"
+protec = "ethereum_test_cli.pytest_commands.consume:consume"
+checklist = "ethereum_test_cli.pytest_commands.checklist:checklist"
+generate_checklist_stubs = "ethereum_test_cli.generate_checklist_stubs:generate_checklist_stubs"
+genindex = "ethereum_test_cli.gen_index:generate_fixtures_index_cli"
+gentest = "ethereum_test_cli.gentest:generate"
+eofwrap = "ethereum_test_cli.eofwrap:eof_wrap"
+pyspelling_soft_fail = "ethereum_test_cli.tox_helpers:pyspelling"
+markdownlintcli2_soft_fail = "ethereum_test_cli.tox_helpers:markdownlint"
+order_fixtures = "ethereum_test_cli.order_fixtures:order_fixtures"
+evm_bytes = "ethereum_test_cli.evm_bytes:evm_bytes"
+hasher = "ethereum_test_cli.hasher:main"
+eest = "ethereum_test_cli.eest.cli:eest"
+fillerconvert = "ethereum_test_cli.fillerconvert.fillerconvert:main"
+groupstats = "ethereum_test_cli.show_pre_alloc_group_stats:main"
+extract_config = "ethereum_test_cli.extract_config:extract_config"
+compare_fixtures = "ethereum_test_cli.compare_fixtures:main"
+modify_static_test_gas_limits = "ethereum_test_cli.modify_static_test_gas_limits:main"
 
 [tool.setuptools.packages.find]
 where = ["src"]
@@ -119,8 +119,8 @@ exclude = ["tests/static/**"]
 ethereum_test_forks = ["forks/contracts/*.bin"]
 "pytest_plugins.execute" = ["eth_config/networks.yml"]
 "pytest_plugins" = ["eels_resolutions.json"]
-"cli.eest.make" = ["templates/*.j2"]
-"cli.pytest_commands" = ["pytest_ini_files/*.ini"]
+"ethereum_test_cli.eest.make" = ["templates/*.j2"]
+"ethereum_test_cli.pytest_commands" = ["pytest_ini_files/*.ini"]
 "ethereum_test_types" = ["kzg_trusted_setup.txt"]
 
 [tool.ruff]

diff --git a/src/cli/__init__.py → src/ethereum_test_cli/__init__.py b/src/cli/__init__.py → src/ethereum_test_cli/__init__.py
diff --git a/src/cli/check_fixtures.py → src/ethereum_test_cli/check_fixtures.py b/src/cli/check_fixtures.py → src/ethereum_test_cli/check_fixtures.py
diff --git a/src/cli/compare_fixtures.py → src/ethereum_test_cli/compare_fixtures.py b/src/cli/compare_fixtures.py → src/ethereum_test_cli/compare_fixtures.py
diff --git a/src/cli/eest/__init__.py → src/ethereum_test_cli/eest/__init__.py b/src/cli/eest/__init__.py → src/ethereum_test_cli/eest/__init__.py
diff --git a/src/cli/eest/cli.py → src/ethereum_test_cli/eest/cli.py b/src/cli/eest/cli.py → src/ethereum_test_cli/eest/cli.py
diff --git a/src/cli/eest/commands/__init__.py → ...hereum_test_cli/eest/commands/__init__.py b/src/cli/eest/commands/__init__.py → ...hereum_test_cli/eest/commands/__init__.py
diff --git a/src/cli/eest/commands/clean.py → src/ethereum_test_cli/eest/commands/clean.py b/src/cli/eest/commands/clean.py → src/ethereum_test_cli/eest/commands/clean.py
diff --git a/src/cli/eest/commands/info.py → src/ethereum_test_cli/eest/commands/info.py b/src/cli/eest/commands/info.py → src/ethereum_test_cli/eest/commands/info.py
diff --git a/src/cli/eest/make/__init__.py → src/ethereum_test_cli/eest/make/__init__.py b/src/cli/eest/make/__init__.py → src/ethereum_test_cli/eest/make/__init__.py
diff --git a/src/cli/eest/make/cli.py → src/ethereum_test_cli/eest/make/cli.py b/src/cli/eest/make/cli.py → src/ethereum_test_cli/eest/make/cli.py
diff --git a/src/cli/eest/make/commands/__init__.py → ...m_test_cli/eest/make/commands/__init__.py b/src/cli/eest/make/commands/__init__.py → ...m_test_cli/eest/make/commands/__init__.py
diff --git a/src/cli/eest/make/commands/env.py → ...hereum_test_cli/eest/make/commands/env.py b/src/cli/eest/make/commands/env.py → ...hereum_test_cli/eest/make/commands/env.py
diff --git a/src/cli/eest/make/commands/test.py → ...ereum_test_cli/eest/make/commands/test.py b/src/cli/eest/make/commands/test.py → ...ereum_test_cli/eest/make/commands/test.py
diff --git a/...eest/make/templates/blockchain_test.py.j2 → ...eest/make/templates/blockchain_test.py.j2 b/...eest/make/templates/blockchain_test.py.j2 → ...eest/make/templates/blockchain_test.py.j2
diff --git a/src/cli/eest/make/templates/state_test.py.j2 → ..._cli/eest/make/templates/state_test.py.j2 b/src/cli/eest/make/templates/state_test.py.j2 → ..._cli/eest/make/templates/state_test.py.j2
diff --git a/src/cli/eest/quotes.py → src/ethereum_test_cli/eest/quotes.py b/src/cli/eest/quotes.py → src/ethereum_test_cli/eest/quotes.py
diff --git a/src/cli/eofwrap.py → src/ethereum_test_cli/eofwrap.py b/src/cli/eofwrap.py → src/ethereum_test_cli/eofwrap.py
diff --git a/src/cli/evm_bytes.py → src/ethereum_test_cli/evm_bytes.py b/src/cli/evm_bytes.py → src/ethereum_test_cli/evm_bytes.py
diff --git a/src/cli/extract_config.py → src/ethereum_test_cli/extract_config.py b/src/cli/extract_config.py → src/ethereum_test_cli/extract_config.py
diff --git a/src/cli/fillerconvert/fillerconvert.py → ...m_test_cli/fillerconvert/fillerconvert.py b/src/cli/fillerconvert/fillerconvert.py → ...m_test_cli/fillerconvert/fillerconvert.py
diff --git a/src/cli/fillerconvert/verify_filled.py → ...m_test_cli/fillerconvert/verify_filled.py b/src/cli/fillerconvert/verify_filled.py → ...m_test_cli/fillerconvert/verify_filled.py
diff --git a/src/cli/gen_index.py → src/ethereum_test_cli/gen_index.py b/src/cli/gen_index.py → src/ethereum_test_cli/gen_index.py
diff --git a/src/cli/generate_checklist_stubs.py → ...reum_test_cli/generate_checklist_stubs.py b/src/cli/generate_checklist_stubs.py → ...reum_test_cli/generate_checklist_stubs.py
diff --git a/src/cli/gentest/__init__.py → src/ethereum_test_cli/gentest/__init__.py b/src/cli/gentest/__init__.py → src/ethereum_test_cli/gentest/__init__.py
diff --git a/src/cli/gentest/cli.py → src/ethereum_test_cli/gentest/cli.py b/src/cli/gentest/cli.py → src/ethereum_test_cli/gentest/cli.py
diff --git a/src/cli/gentest/request_manager.py → ...ereum_test_cli/gentest/request_manager.py b/src/cli/gentest/request_manager.py → ...ereum_test_cli/gentest/request_manager.py
diff --git a/src/cli/gentest/source_code_generator.py → ...test_cli/gentest/source_code_generator.py b/src/cli/gentest/source_code_generator.py → ...test_cli/gentest/source_code_generator.py
diff --git a/...mplates/blockchain_test/transaction.py.j2 → ...mplates/blockchain_test/transaction.py.j2 b/...mplates/blockchain_test/transaction.py.j2 → ...mplates/blockchain_test/transaction.py.j2
diff --git a/src/cli/gentest/test_context_providers.py → ...est_cli/gentest/test_context_providers.py b/src/cli/gentest/test_context_providers.py → ...est_cli/gentest/test_context_providers.py
diff --git a/src/cli/gentest/test_providers.py → ...hereum_test_cli/gentest/test_providers.py b/src/cli/gentest/test_providers.py → ...hereum_test_cli/gentest/test_providers.py
diff --git a/src/cli/gentest/tests/__init__.py → ...hereum_test_cli/gentest/tests/__init__.py b/src/cli/gentest/tests/__init__.py → ...hereum_test_cli/gentest/tests/__init__.py
diff --git a/src/cli/gentest/tests/test_cli.py → ...hereum_test_cli/gentest/tests/test_cli.py b/src/cli/gentest/tests/test_cli.py → ...hereum_test_cli/gentest/tests/test_cli.py
diff --git a/src/cli/hasher.py → src/ethereum_test_cli/hasher.py b/src/cli/hasher.py → src/ethereum_test_cli/hasher.py
diff --git a/src/cli/input/__init__.py → src/ethereum_test_cli/input/__init__.py b/src/cli/input/__init__.py → src/ethereum_test_cli/input/__init__.py
diff --git a/src/cli/input/input_repository.py → ...hereum_test_cli/input/input_repository.py b/src/cli/input/input_repository.py → ...hereum_test_cli/input/input_repository.py
diff --git a/...cli/input/questionary_input_repository.py → ...cli/input/questionary_input_repository.py b/...cli/input/questionary_input_repository.py → ...cli/input/questionary_input_repository.py
diff --git a/src/cli/modify_static_test_gas_limits.py → ...test_cli/modify_static_test_gas_limits.py b/src/cli/modify_static_test_gas_limits.py → ...test_cli/modify_static_test_gas_limits.py
diff --git a/src/cli/order_fixtures.py → src/ethereum_test_cli/order_fixtures.py b/src/cli/order_fixtures.py → src/ethereum_test_cli/order_fixtures.py
diff --git a/src/cli/pytest_commands/__init__.py → ...reum_test_cli/pytest_commands/__init__.py b/src/cli/pytest_commands/__init__.py → ...reum_test_cli/pytest_commands/__init__.py
@@ -27,7 +27,7 @@
 shell:
 
 ```
-from src.cli.pytest_commands.fill import fill
+from src.ethereum_test_cli.pytest_commands.fill import fill
 from click.testing import CliRunner
 
 runner = CliRunner()

diff --git a/src/cli/pytest_commands/base.py → ...ethereum_test_cli/pytest_commands/base.py b/src/cli/pytest_commands/base.py → ...ethereum_test_cli/pytest_commands/base.py
diff --git a/...cli/pytest_commands/check_eip_versions.py → ...cli/pytest_commands/check_eip_versions.py b/...cli/pytest_commands/check_eip_versions.py → ...cli/pytest_commands/check_eip_versions.py
diff --git a/src/cli/pytest_commands/checklist.py → ...eum_test_cli/pytest_commands/checklist.py b/src/cli/pytest_commands/checklist.py → ...eum_test_cli/pytest_commands/checklist.py
diff --git a/src/cli/pytest_commands/consume.py → ...ereum_test_cli/pytest_commands/consume.py b/src/cli/pytest_commands/consume.py → ...ereum_test_cli/pytest_commands/consume.py
diff --git a/src/cli/pytest_commands/execute.py → ...ereum_test_cli/pytest_commands/execute.py b/src/cli/pytest_commands/execute.py → ...ereum_test_cli/pytest_commands/execute.py
diff --git a/src/cli/pytest_commands/fill.py → ...ethereum_test_cli/pytest_commands/fill.py b/src/cli/pytest_commands/fill.py → ...ethereum_test_cli/pytest_commands/fill.py
diff --git a/src/cli/pytest_commands/processors.py → ...um_test_cli/pytest_commands/processors.py b/src/cli/pytest_commands/processors.py → ...um_test_cli/pytest_commands/processors.py
diff --git a/...t_ini_files/pytest-check-eip-versions.ini → ...t_ini_files/pytest-check-eip-versions.ini b/...t_ini_files/pytest-check-eip-versions.ini → ...t_ini_files/pytest-check-eip-versions.ini
diff --git a/...mands/pytest_ini_files/pytest-consume.ini → ...mands/pytest_ini_files/pytest-consume.ini b/...mands/pytest_ini_files/pytest-consume.ini → ...mands/pytest_ini_files/pytest-consume.ini
diff --git a/...t_ini_files/pytest-execute-eth-config.ini → ...t_ini_files/pytest-execute-eth-config.ini b/...t_ini_files/pytest-execute-eth-config.ini → ...t_ini_files/pytest-execute-eth-config.ini
diff --git a/.../pytest_ini_files/pytest-execute-hive.ini → .../pytest_ini_files/pytest-execute-hive.ini b/.../pytest_ini_files/pytest-execute-hive.ini → .../pytest_ini_files/pytest-execute-hive.ini
diff --git a/...test_ini_files/pytest-execute-recover.ini → ...test_ini_files/pytest-execute-recover.ini b/...test_ini_files/pytest-execute-recover.ini → ...test_ini_files/pytest-execute-recover.ini
diff --git a/...mands/pytest_ini_files/pytest-execute.ini → ...mands/pytest_ini_files/pytest-execute.ini b/...mands/pytest_ini_files/pytest-execute.ini → ...mands/pytest_ini_files/pytest-execute.ini
diff --git a/...commands/pytest_ini_files/pytest-fill.ini → ...commands/pytest_ini_files/pytest-fill.ini b/...commands/pytest_ini_files/pytest-fill.ini → ...commands/pytest_ini_files/pytest-fill.ini
diff --git a/src/cli/show_pre_alloc_group_stats.py → ...um_test_cli/show_pre_alloc_group_stats.py b/src/cli/show_pre_alloc_group_stats.py → ...um_test_cli/show_pre_alloc_group_stats.py
diff --git a/src/cli/tests/__init__.py → src/ethereum_test_cli/tests/__init__.py b/src/cli/tests/__init__.py → src/ethereum_test_cli/tests/__init__.py
diff --git a/src/cli/tests/test_eofwrap.py → src/ethereum_test_cli/tests/test_eofwrap.py b/src/cli/tests/test_eofwrap.py → src/ethereum_test_cli/tests/test_eofwrap.py
diff --git a/src/cli/tests/test_evm_bytes.py → ...ethereum_test_cli/tests/test_evm_bytes.py b/src/cli/tests/test_evm_bytes.py → ...ethereum_test_cli/tests/test_evm_bytes.py
diff --git a/src/cli/tests/test_generate_all_formats.py → ...st_cli/tests/test_generate_all_formats.py b/src/cli/tests/test_generate_all_formats.py → ...st_cli/tests/test_generate_all_formats.py
@@ -2,7 +2,7 @@
 
 from unittest.mock import patch
 
-from cli.pytest_commands.fill import FillCommand
+from ethereum_test_cli.pytest_commands.fill import FillCommand
 
 
 def test_generate_all_formats_creates_two_phase_execution():

diff --git a/src/cli/tests/test_order_fixtures.py → ...eum_test_cli/tests/test_order_fixtures.py b/src/cli/tests/test_order_fixtures.py → ...eum_test_cli/tests/test_order_fixtures.py
diff --git a/src/cli/tests/test_pytest_execute_command.py → ..._cli/tests/test_pytest_execute_command.py b/src/cli/tests/test_pytest_execute_command.py → ..._cli/tests/test_pytest_execute_command.py
diff --git a/src/cli/tests/test_pytest_fill_command.py → ...est_cli/tests/test_pytest_fill_command.py b/src/cli/tests/test_pytest_fill_command.py → ...est_cli/tests/test_pytest_fill_command.py
diff --git a/src/cli/tox_helpers.py → src/ethereum_test_cli/tox_helpers.py b/src/cli/tox_helpers.py → src/ethereum_test_cli/tox_helpers.py
diff --git a/src/ethereum_test_specs/tests/test_fixtures.py b/src/ethereum_test_specs/tests/test_fixtures.py
@@ -7,7 +7,7 @@
 import pytest
 from click.testing import CliRunner
 
-import cli.check_fixtures
+import ethereum_test_cli.check_fixtures
 from ethereum_clis import TransitionTool
 from ethereum_test_base_types import AccessList, Account, Address, Hash
 from ethereum_test_exceptions import TransactionException
@@ -52,7 +52,7 @@ def test_check_helper_fixtures():
         "--quiet",
         "--stop-on-error",
     ]
-    result = runner.invoke(cli.check_fixtures.check_fixtures, args)
+    result = runner.invoke(ethereum_test_cli.check_fixtures.check_fixtures, args)
     assert result.exit_code == 0, (
         "check_fixtures detected errors in the json fixtures:" + f"\n{result}"
     )

diff --git a/src/pytest_plugins/consume/consume.py b/src/pytest_plugins/consume/consume.py
@@ -14,7 +14,7 @@
 import requests
 import rich
 
-from cli.gen_index import generate_fixtures_index
+from ethereum_test_cli.gen_index import generate_fixtures_index
 from ethereum_test_fixtures import BaseFixture
 from ethereum_test_fixtures.consume import IndexFile, TestCases
 from ethereum_test_forks import get_forks, get_relative_fork_markers, get_transition_forks

diff --git a/src/pytest_plugins/filler/filler.py b/src/pytest_plugins/filler/filler.py
@@ -22,10 +22,10 @@
 from filelock import FileLock
 from pytest_metadata.plugin import metadata_key  # type: ignore
 
-from cli.gen_index import generate_fixtures_index
 from ethereum_clis import TransitionTool
 from ethereum_clis.clis.geth import FixtureConsumerTool
 from ethereum_test_base_types import Account, Address, Alloc, ReferenceSpec
+from ethereum_test_cli.gen_index import generate_fixtures_index
 from ethereum_test_fixtures import (
     BaseFixture,
     FixtureCollector,

diff --git a/src/pytest_plugins/filler/tests/test_output_directory.py b/src/pytest_plugins/filler/tests/test_output_directory.py
@@ -57,7 +57,9 @@ def _run_fill(
         disable_capture_output: bool = False,
     ) -> pytest.RunResult:
         """Run the fill command with the specified output directory and clean flag."""
-        pytester.copy_example(name="src/cli/pytest_commands/pytest_ini_files/pytest-fill.ini")
+        pytester.copy_example(
+            name="src/ethereum_test_cli/pytest_commands/pytest_ini_files/pytest-fill.ini"
+        )
         args = [
             "-c",
             "pytest-fill.ini",

diff --git a/src/pytest_plugins/filler/tests/test_prealloc_group.py b/src/pytest_plugins/filler/tests/test_prealloc_group.py
@@ -417,7 +417,9 @@ def test_pre_alloc_grouping_by_test_type(
     for i, test in enumerate(test_definitions):
         test_module = tests_dir / f"test_{i}.py"
         test_module.write_text(test.format())
-    pytester.copy_example(name="src/cli/pytest_commands/pytest_ini_files/pytest-fill.ini")
+    pytester.copy_example(
+        name="src/ethereum_test_cli/pytest_commands/pytest_ini_files/pytest-fill.ini"
+    )
     args = [
         "-c",
         "pytest-fill.ini",

diff --git a/tox.ini b/tox.ini
@@ -35,18 +35,18 @@ extras = docs
 passenv =
     GITHUB_ACTIONS
     GITHUB_STEP_SUMMARY
-commands = python -c "import src.cli.tox_helpers; src.cli.tox_helpers.codespell()"
+commands = python -c "import src.ethereum_test_cli.tox_helpers; src.ethereum_test_cli.tox_helpers.codespell()"
 
 
 [testenv:markdownlint]
 description = Lint markdown files (markdownlint)
 extras = docs
-commands = python -c "import src.cli.tox_helpers; src.cli.tox_helpers.markdownlint()"
+commands = python -c "import src.ethereum_test_cli.tox_helpers; src.ethereum_test_cli.tox_helpers.markdownlint()"
 
 [testenv:changelog]
 description = Validate changelog entries (changelog)
 extras = docs
-commands = python -c "import src.cli.tox_helpers; src.cli.tox_helpers.validate_changelog()"
+commands = python -c "import src.ethereum_test_cli.tox_helpers; src.ethereum_test_cli.tox_helpers.validate_changelog()"
 
 [testenv:mkdocs]
 description = Build documentation in strict mode (mkdocs)