chore: more package and source path fixes for package renaming

danceratopz · danceratopz · commit 24d43682aa4d · 2025-10-29T23:09:57.000+01:00
diff --git a/docs/library/index.md b/docs/library/index.md
@@ -2,13 +2,13 @@
 
 Execution spec tests consists of several packages that implement helper classes and tools that enable and simplify test case implementation. This section contains their reference documentation:
 
-- [`ethereum_test_base_types`](./ethereum_test_base_types.md) - provides the basic types on top of which other testing libraries are built.
-- [`ethereum_test_exceptions`](./ethereum_test_exceptions.md) - provides definitions for exceptions used in all tests.
-- [`ethereum_test_fixtures`](./ethereum_test_fixtures.md) - provides definitions of all test fixture types that are produced in this repository and can be consumed by clients.
-- [`ethereum_test_forks`](./ethereum_test_forks.md) - provides definitions for supported forks used in tests.
-- [`ethereum_test_specs`](./ethereum_test_specs.md) - provides definitions for all spec types used to define test cases, and generate different kinds of test fixtures.
-- [`ethereum_test_tools`](./ethereum_test_tools.md) - provides primitives and helpers to test Ethereum execution clients.
-- [`ethereum_test_types`](./ethereum_test_types.md) - provides Ethereum types built on top of the base types which are used to define test cases and interact with other libraries.
-- [`ethereum_test_vm`](./ethereum_test_vm.md) - provides definitions for the Ethereum Virtual Machine (EVM) as used to define bytecode in test cases.
-- [`ethereum_clis`](./ethereum_clis.md) - a wrapper for the transition (`t8n`) tool.
+- [`execution_testing.base_types`](./execution_testing_base_types.md) - provides the basic types on top of which other testing libraries are built.
+- [`execution_testing.exceptions`](./execution_testing_exceptions.md) - provides definitions for exceptions used in all tests.
+- [`execution_testing.fixtures`](./execution_testing_fixtures.md) - provides definitions of all test fixture types that are produced in this repository and can be consumed by clients.
+- [`execution_testing.forks`](./execution_testing_forks.md) - provides definitions for supported forks used in tests.
+- [`execution_testing.specs`](./execution_testing_specs.md) - provides definitions for all spec types used to define test cases, and generate different kinds of test fixtures.
+- [`execution_testing.tools`](./execution_testing_tools.md) - provides primitives and helpers to test Ethereum execution clients.
+- [`execution_testing.test_types`](./execution_testing_test_types.md) - provides Ethereum types built on top of the base types which are used to define test cases and interact with other libraries.
+- [`execution_testing.vm`](./execution_testing_vm.md) - provides definitions for the Ethereum Virtual Machine (EVM) as used to define bytecode in test cases.
+- [`execution_testing.client_clis`](./execution_testing_client_clis.md) - a wrapper for the transition (`t8n`) tool.
 - [`pytest_plugins`](./pytest_plugins/index.md) - contains pytest customizations that provide additional functionality for generating test fixtures.
diff --git a/docs/navigation.md b/docs/navigation.md
@@ -78,13 +78,13 @@
   * [Changelog](CHANGELOG.md)
   * [Library Reference](library/index.md)
       * [EEST CLI Tools](library/cli/index.md)
-      * [Ethereum Test Base Types Package](library/ethereum_test_base_types.md)
-      * [Ethereum Test Exceptions Package](library/ethereum_test_exceptions.md)
-      * [Ethereum Test Fixtures Package](library/ethereum_test_fixtures.md)
-      * [Ethereum Test Forks Package](library/ethereum_test_forks.md)
-      * [Ethereum Test Specs Package](library/ethereum_test_specs.md)
-      * [Ethereum Test Tools Package](library/ethereum_test_tools.md)
-      * [Ethereum Test Types Package](library/ethereum_test_types.md)
-      * [Ethereum Test VM Package](library/ethereum_test_vm.md)
-      * [Ethereum CLIs Package](library/ethereum_clis.md)
+      * [Execution Testing Base Types Package](library/execution_testing_base_types.md)
+      * [Execution Testing Exceptions Package](library/execution_testing_exceptions.md)
+      * [Execution Testing Fixtures Package](library/execution_testing_fixtures.md)
+      * [Execution Testing Forks Package](library/execution_testing_forks.md)
+      * [Execution Testing Specs Package](library/execution_testing_specs.md)
+      * [Execution Testing Tools Package](library/execution_testing_tools.md)
+      * [Execution Testing Test Types Package](library/execution_testing_test_types.md)
+      * [Execution Testing VM Package](library/execution_testing_vm.md)
+      * [Execution Testing Client CLIs Package](library/execution_testing_client_clis.md)
       * [Pytest Plugins](library/pytest_plugins/index.md)
diff --git a/docs/running_tests/consume/exceptions.md b/docs/running_tests/consume/exceptions.md
@@ -19,7 +19,7 @@ Each client has unique error message formats. EEST maintains exception mappers t
 
 Exception mappers are defined in the EEST codebase:
 
-- `src/ethereum_clis/clis/<client>.py` (e.g., `geth.py`, `besu.py`, `nethermind.py`)
+- `packages/testing/src/execution_testing/client_clis/clis/<client>.py` (e.g., `geth.py`, `besu.py`, `nethermind.py`)
 
 ### Example Mapper Structure
 
@@ -52,10 +52,10 @@ Unmapped exception from client 'go-ethereum': "block gas cost exceeds limit: hav
 
 ### 2. Update the Exception Mapper
 
-Edit the client's exception mapper in `src/ethereum_clis/clis/<client>.py`:
+Edit the client's exception mapper in `packages/testing/src/execution_testing/client_clis/clis/<client>.py`:
 
 ```python
-# In src/ethereum_clis/clis/geth.py
+# In packages/testing/src/execution_testing/client_clis/clis/geth.py
 class GethCLI(TransitionTool):
     exception_map = {
         # Existing mappings...
diff --git a/docs/running_tests/test_formats/blockchain_test.md b/docs/running_tests/test_formats/blockchain_test.md
@@ -216,7 +216,7 @@ Optional list of withdrawals included in the block RLP.
 
 ### `InvalidFixtureBlock`
 
-#### - `expectException`: [`TransactionException`](../../library/ethereum_test_exceptions.md#ethereum_test_exceptions.TransactionException)` | `[`BlockException`](../../library/ethereum_test_exceptions.md#ethereum_test_exceptions.BlockException)
+#### - `expectException`: [`TransactionException`](../../library/execution_testing_exceptions.md#execution_testing.exceptions.TransactionException)` | `[`BlockException`](../../library/execution_testing_exceptions.md#execution_testing.exceptions.BlockException)
 
 Expected exception that invalidates the block.
 
diff --git a/docs/running_tests/test_formats/blockchain_test_engine.md b/docs/running_tests/test_formats/blockchain_test_engine.md
@@ -104,7 +104,7 @@ They can mismatch the hashes of the versioned blobs in the execution payload, fo
 
 Hash of the parent beacon block root.
 
-#### - `validationError`: [`TransactionException`](../../library/ethereum_test_exceptions.md#ethereum_test_exceptions.TransactionException)` | `[`BlockException`](../../library/ethereum_test_exceptions.md#ethereum_test_exceptions.BlockException)
+#### - `validationError`: [`TransactionException`](../../library/execution_testing_exceptions.md#execution_testing.exceptions.TransactionException)` | `[`BlockException`](../../library/execution_testing_exceptions.md#execution_testing.exceptions.BlockException)
 
 Validation error expected when executing the payload.
 
diff --git a/docs/running_tests/test_formats/blockchain_test_sync.md b/docs/running_tests/test_formats/blockchain_test_sync.md
@@ -127,7 +127,7 @@ List of hashes of the versioned blobs that are part of the execution payload.
 
 Hash of the parent beacon block root.
 
-#### - `validationError`: [`Optional`](./common_types.md#optional)`[`[`TransactionException`](../../library/ethereum_test_exceptions.md#ethereum_test_exceptions.TransactionException)` | `[`BlockException`](../../library/ethereum_test_exceptions.md#ethereum_test_exceptions.BlockException)`]`
+#### - `validationError`: [`Optional`](./common_types.md#optional)`[`[`TransactionException`](../../library/execution_testing_exceptions.md#execution_testing.exceptions.TransactionException)` | `[`BlockException`](../../library/execution_testing_exceptions.md#execution_testing.exceptions.BlockException)`]`
 
 For sync tests, this field should not be present as sync tests only work with valid chains. Invalid blocks cannot be synced.
 
diff --git a/docs/running_tests/test_formats/exceptions.md b/docs/running_tests/test_formats/exceptions.md
@@ -13,4 +13,4 @@ The JSON string can contain multiple exception types, separated by the `|`
 character, denoting that the transaction or block can throw either one of
 the exceptions.
 
-For a list of all defined exceptions look at [Ethereum Test Exceptions Package](../../library/ethereum_test_exceptions.md).
+For a list of all defined exceptions look at [Execution Testing Exceptions Package](../../library/execution_testing_exceptions.md).
diff --git a/docs/running_tests/test_formats/state_test.md b/docs/running_tests/test_formats/state_test.md
@@ -179,7 +179,7 @@ Expected state root value that results of applying the transaction to the pre-st
 Hash of the RLP representation of the state logs result of applying the transaction to the pre-state
 (TODO: double-check this.)
 
-#### - `expectException`: [`TransactionException`](../../library/ethereum_test_exceptions.md#ethereum_test_exceptions.TransactionException)
+#### - `expectException`: [`TransactionException`](../../library/execution_testing_exceptions.md#execution_testing.exceptions.TransactionException)
 
 Exception that is expected to be thrown by the transaction execution (Field is missing if the transaction is expected to succeed)
 
diff --git a/docs/running_tests/test_formats/transaction_test.md b/docs/running_tests/test_formats/transaction_test.md
@@ -62,6 +62,6 @@ Total intrinsic gas cost of the transaction (Field is missing if the transaction
 
 Sender address of the transaction (Field is missing if the transaction is expected to fail).
 
-#### - `exception`: [`TransactionException`](../../library/ethereum_test_exceptions.md#ethereum_test_exceptions.TransactionException)
+#### - `exception`: [`TransactionException`](../../library/execution_testing_exceptions.md#execution_testing.exceptions.TransactionException)
 
 Exception that is expected to be thrown by the transaction parsing (Field is missing if the transaction is expected to succeed).
diff --git a/docs/writing_tests/checklist_templates/eip_testing_checklist_template.md b/docs/writing_tests/checklist_templates/eip_testing_checklist_template.md
@@ -308,8 +308,8 @@ Opcode is used to attempt to recreate a contract that is currently mid-creation
 
 ### Framework Changes
 
-- Add opcode to `src/ethereum_test_vm/opcode.py`
-- Add opcode to relevant methods in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py`
+- Add opcode to `packages/testing/src/execution_testing/vm/opcode.py`
+- Add opcode to relevant methods in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py`
 
 ## New Precompile
 
@@ -504,7 +504,7 @@ Verify the cold/warm state of the precompile address depending on the fork activ
 
 ### Framework Changes
 
-- Add precompile address to relevant methods in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py`
+- Add precompile address to relevant methods in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py`
 
 ## Removed Precompile
 
@@ -533,7 +533,7 @@ Verify the cold/warm state of the precompile address depending on the fork activ
 
 ### Framework Changes
 
-- Remove the precompile address from relevant methods in the fork where the EIP is removed in `src/ethereum_test_forks/forks/forks.py`
+- Remove the precompile address from relevant methods in the fork where the EIP is removed in `packages/testing/src/execution_testing/forks/forks/forks.py`
 
 ## New System Contract
 
@@ -753,8 +753,8 @@ Verify calling the system contract before its activation fork results in correct
 
 ### Framework Changes
 
-- Add system contract address to relevant methods in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py`
-- Add system contract bytecode to the returned value of `pre_allocation_blockchain` in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py`
+- Add system contract address to relevant methods in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py`
+- Add system contract bytecode to the returned value of `pre_allocation_blockchain` in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py`
 
 ## New Transaction Type
 
@@ -1004,8 +1004,8 @@ Verify that a block prior to fork activation where the new transaction type is i
 
 ### Framework Changes
 
-- Modify `transaction_intrinsic_cost_calculator` in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py`, adding the appropriate new fields that the transaction introduced and the logic to the intrinsic gas cost calculation, if any.
-- Add the transaction type number to `tx_types` response in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py` (If applicable add also to `contract_creating_tx_types`).
+- Modify `transaction_intrinsic_cost_calculator` in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py`, adding the appropriate new fields that the transaction introduced and the logic to the intrinsic gas cost calculation, if any.
+- Add the transaction type number to `tx_types` response in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py` (If applicable add also to `contract_creating_tx_types`).
 
 ## New Block Header Field
 
@@ -1103,10 +1103,10 @@ Verify gas costs are updated at the fork transition boundary.
 
 ### Framework Changes
 
-- Modify `transaction_intrinsic_cost_calculator` in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py` if the EIP affects intrinsic gas cost calculation.
-- Modify `transaction_data_floor_cost_calculator` in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py` if the EIP affects calldata floor cost.
-- Modify `memory_expansion_gas_calculator` in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py` if the EIP affects memory expansion gas cost calculation.
-- Modify `gas_costs` in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py` if the EIP affects specific opcode gas costs.
+- Modify `transaction_intrinsic_cost_calculator` in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py` if the EIP affects intrinsic gas cost calculation.
+- Modify `transaction_data_floor_cost_calculator` in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py` if the EIP affects calldata floor cost.
+- Modify `memory_expansion_gas_calculator` in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py` if the EIP affects memory expansion gas cost calculation.
+- Modify `gas_costs` in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py` if the EIP affects specific opcode gas costs.
 
 ## Gas Refunds Changes
 
@@ -1162,7 +1162,7 @@ Verify tests in `tests/cancun/eip4844_blobs` were correctly and automatically up
 
 ### Framework Changes
 
-- Modify `blob_base_fee_update_fraction`, `target_blobs_per_block`, `max_blobs_per_block` in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py` if the EIP affects any of the values returned by each function.
+- Modify `blob_base_fee_update_fraction`, `target_blobs_per_block`, `max_blobs_per_block` in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py` if the EIP affects any of the values returned by each function.
 
 ## New Execution Layer Request
 
@@ -1176,7 +1176,7 @@ Verify tests in `tests/cancun/eip4844_blobs` were correctly and automatically up
 
 ### Framework Changes
 
-- Increment `max_request_type` in the fork where the EIP is introduced in `src/ethereum_test_forks/forks/forks.py` to the new maximum request type number after the EIP is activated.
+- Increment `max_request_type` in the fork where the EIP is introduced in `packages/testing/src/execution_testing/forks/forks/forks.py` to the new maximum request type number after the EIP is activated.
 
 ## New Transaction-Validity Constraint
 
diff --git a/docs/writing_tests/eip_checklist.md b/docs/writing_tests/eip_checklist.md
@@ -124,7 +124,7 @@ The `EIPChecklist` classes are made callable through a companion `.pyi` stub fil
 
 ### Regenerating Type Stubs
 
-If you modify the `EIPChecklist` class structure in `src/ethereum_test_checklists/eip_checklist.py`, you need to regenerate the type stub file:
+If you modify the `EIPChecklist` class structure in `packages/testing/src/execution_testing/checklists/eip_checklist.py`, you need to regenerate the type stub file:
 
 ```bash
 # Generate the stub file (for maintainers):
diff --git a/docs/writing_tests/exception_tests.md b/docs/writing_tests/exception_tests.md
@@ -4,13 +4,13 @@ Exception tests are a special type of test which verify that an invalid transact
 
 ## Creating an Exception Test
 
-To test for an exception, the test can use either of the following types from `ethereum_test_exceptions` library:
+To test for an exception, the test can use either of the following types from `execution_testing.exceptions` library:
 
-1. [`TransactionException`](../library/ethereum_test_exceptions.md#ethereum_test_exceptions.TransactionException): To be added to the `error` field of the `Transaction` object, and to the `exception` field of the `Block` object that includes the transaction; this exception type is used when a transaction is invalid, and therefore when included in a block, the block is expected to be invalid too. This is different from valid transactions where an exception during EVM execution is expected (e.g. a revert, or out-of-gas), which can be included in valid blocks.
+1. [`TransactionException`](../library/execution_testing_exceptions.md#execution_testing.exceptions.TransactionException): To be added to the `error` field of the `Transaction` object, and to the `exception` field of the `Block` object that includes the transaction; this exception type is used when a transaction is invalid, and therefore when included in a block, the block is expected to be invalid too. This is different from valid transactions where an exception during EVM execution is expected (e.g. a revert, or out-of-gas), which can be included in valid blocks.
 
     For an example, see [`eip3860_initcode.test_initcode.test_contract_creating_tx`](../tests/shanghai/eip3860_initcode/test_initcode/test_contract_creating_tx.md) which raises `TransactionException.INITCODE_SIZE_EXCEEDED` in the case that the initcode size exceeds the maximum allowed size.
 
-2. [`BlockException`](../library/ethereum_test_exceptions.md#ethereum_test_exceptions.BlockException): To be added to the `exception` field of the `Block` object; this exception type is used when a block is expected to be invalid, but the exception is related to a block property, e.g. an invalid value of the block header.
+2. [`BlockException`](../library/execution_testing_exceptions.md#execution_testing.exceptions.BlockException): To be added to the `exception` field of the `Block` object; this exception type is used when a block is expected to be invalid, but the exception is related to a block property, e.g. an invalid value of the block header.
 
     For an example, see [`eip4844_blobs.test_excess_blob_gas.test_invalid_static_excess_blob_gas`](../tests/cancun/eip4844_blobs/test_excess_blob_gas/test_invalid_static_excess_blob_gas.md) which raises `BlockException.INCORRECT_EXCESS_BLOB_GAS` in the case that the `excessBlobGas` remains unchanged
     but the parent blobs included are not `TARGET_BLOBS_PER_BLOCK`.
@@ -19,7 +19,7 @@ Although exceptions can be combined with the `|` operator to indicate that a tes
 
 ## Adding a new exception
 
-If a test requires a new exception, because none of the existing ones is suitable for the test, a new exception can be added to either [`TransactionException`](../library/ethereum_test_exceptions.md#ethereum_test_exceptions.TransactionException) or [`BlockException`](../library/ethereum_test_exceptions.md#ethereum_test_exceptions.BlockException) classes.
+If a test requires a new exception, because none of the existing ones is suitable for the test, a new exception can be added to either [`TransactionException`](../library/execution_testing_exceptions.md#execution_testing.exceptions.TransactionException) or [`BlockException`](../library/execution_testing_exceptions.md#execution_testing.exceptions.BlockException) classes.
 
 The new exception should be added as a new enum value, and the docstring of the attribute should be a string that describes the exception.
 
diff --git a/docs/writing_tests/tutorials/state_transition.md b/docs/writing_tests/tutorials/state_transition.md
diff --git a/docs/writing_tests/writing_a_new_test.md b/docs/writing_tests/writing_a_new_test.md
