refactor(fw): split ethereum_test_types/types.py (#1665)

Co-authored-by: danceratopz <danceratopz@gmail.com>

Author: marioevz

docs/CHANGELOG.md

@@ -48,6 +48,7 @@ Users can select any of the artifacts depending on their testing needs for their
 - 🔀 Updated from pytest 7 to [pytest 8](https://docs.pytest.org/en/stable/changelog.html#features-and-improvements), benefits include improved type hinting and hook typing, stricter mark handling, and clearer error messages for plugin and metadata development ([#1433](https://github.com/ethereum/execution-spec-tests/pull/1433)).
 - 🐞 Fix bug in ported-from plugin and coverage script that made PRs fail with modified tests that contained no ported tests ([#1661](https://github.com/ethereum/execution-spec-tests/pull/1661)).
 - 🔀 Refactor the `click`-based CLI interface used for pytest-based commands (`fill`, `execute`, `consume`) to make them more extensible ([#1654](https://github.com/ethereum/execution-spec-tests/pull/1654)).
+- 🔀 Split `src/ethereum_test_types/types.py` into several files to improve code organization ([#1665](https://github.com/ethereum/execution-spec-tests/pull/1665)).
 
 ### 🧪 Test Cases
 
@@ -180,7 +181,7 @@ This feature can be disabled by using `--disable-strict-exception-matching` for
 ### 📋 Misc
 
 - 🐞 Configure `markdownlint` to expect an indent of 4 with unordered lists (otherwise HTML documentation is rendered incorrectly, [#1460](https://github.com/ethereum/execution-spec-tests/pull/1460)).
-- 🔀 Update `eels_resolutions.json` to point to temporary commit `bb0eb750d643ced0ebf5dec732cdd23558d0b7f2`, which is based on `forks/prague` branch, commit `d9a7ee24db359aacecd636349b4f3ac95a4a6e71`, with PRs https://github.com/ethereum/execution-specs/pull/1182, https://github.com/ethereum/execution-specs/pull/1183 and https://github.com/ethereum/execution-specs/pull/1191 merged ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
+- 🔀 Update `eels_resolutions.json` to point to temporary commit `bb0eb750d643ced0ebf5dec732cdd23558d0b7f2`, which is based on `forks/prague` branch, commit `d9a7ee24db359aacecd636349b4f3ac95a4a6e71`, with PRs <https://github.com/ethereum/execution-specs/pull/1182>, <https://github.com/ethereum/execution-specs/pull/1183> and <https://github.com/ethereum/execution-specs/pull/1191> merged ([#1394](https://github.com/ethereum/execution-spec-tests/pull/1394)).
 
 ## [v4.2.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v4.2.0) - 2025-04-08
 
@@ -571,7 +572,7 @@ The following changes may be potentially breaking (all clients were tested with
 
 - Cancun is now the latest deployed fork, and the development fork is now Prague ([#489](https://github.com/ethereum/execution-spec-tests/pull/489)).
 - Stable fixtures artifact `fixtures.tar.gz` has been renamed to `fixtures_stable.tar.gz` ([#573](https://github.com/ethereum/execution-spec-tests/pull/573))
-- The "Blockchain Test Hive" fixture format has been renamed to "Blockchain Test Engine" and updated to more closely resemble the `engine_newPayload` format in the `execution-apis` specification (https://github.com/ethereum/execution-apis/blob/main/src/engine/prague.md#request) and now contains a single `"params"` field instead of multiple fields for each parameter ([#687](https://github.com/ethereum/execution-spec-tests/pull/687)).
+- The "Blockchain Test Hive" fixture format has been renamed to "Blockchain Test Engine" and updated to more closely resemble the `engine_newPayload` format in the `execution-apis` specification (<https://github.com/ethereum/execution-apis/blob/main/src/engine/prague.md#request>) and now contains a single `"params"` field instead of multiple fields for each parameter ([#687](https://github.com/ethereum/execution-spec-tests/pull/687)).
 - Output folder for fixtures has been renamed from "blockchain_tests_hive" to "blockchain_tests_engine" ([#687](https://github.com/ethereum/execution-spec-tests/pull/687)).
 
 ## [v2.1.1](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.1.1) - 2024-03-09
@@ -607,7 +608,7 @@ The following changes may be potentially breaking (all clients were tested with
 
 ## [v2.1.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.1.0) - 2024-01-29: 🐍🏖️ Cancun
 
-Release [v2.1.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.1.0) primarily fixes a small bug introduced within the previous release where transition forks are used within the new `StateTest` format. This was highlighted by @chfast within #405 (https://github.com/ethereum/execution-spec-tests/issues/405), where the fork name `ShanghaiToCancunAtTime15k` was found within state tests.
+Release [v2.1.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.1.0) primarily fixes a small bug introduced within the previous release where transition forks are used within the new `StateTest` format. This was highlighted by @chfast within #405 (<https://github.com/ethereum/execution-spec-tests/issues/405>), where the fork name `ShanghaiToCancunAtTime15k` was found within state tests.
 
 ### 🧪 Test Cases
 

src/cli/eofwrap.py

@@ -32,8 +32,8 @@
 from ethereum_test_specs.eof import EOFParse
 from ethereum_test_tools import Opcodes as Op
 from ethereum_test_types import Transaction
+from ethereum_test_types.block_types import Environment
 from ethereum_test_types.eof.v1 import Container
-from ethereum_test_types.types import Environment
 from ethereum_test_vm.bytecode import Bytecode
 
 

src/ethereum_test_fixtures/blockchain.py

@@ -33,13 +33,12 @@
 )
 from ethereum_test_exceptions import EngineAPIError, ExceptionInstanceOrList
 from ethereum_test_forks import Fork, Paris
-from ethereum_test_types.types import (
+from ethereum_test_types import (
     Transaction,
-    TransactionFixtureConverter,
-    TransactionGeneric,
     Withdrawal,
-    WithdrawalGeneric,
 )
+from ethereum_test_types.block_types import WithdrawalGeneric
+from ethereum_test_types.transaction_types import TransactionFixtureConverter, TransactionGeneric
 
 from .base import BaseFixture
 from .common import FixtureAuthorizationTuple, FixtureBlobSchedule

src/ethereum_test_fixtures/common.py

@@ -11,7 +11,8 @@
     SignableRLPSerializable,
     ZeroPaddedHexNumber,
 )
-from ethereum_test_types.types import Address, AuthorizationTupleGeneric
+from ethereum_test_types.account_types import Address
+from ethereum_test_types.transaction_types import AuthorizationTupleGeneric
 
 
 class FixtureForkBlobSchedule(CamelModel):

src/ethereum_test_fixtures/state.py

@@ -9,13 +9,13 @@
     Address,
     Alloc,
     Bytes,
+    CamelModel,
     Hash,
     ZeroPaddedHexNumber,
 )
 from ethereum_test_exceptions import TransactionExceptionInstanceOrList
-from ethereum_test_types.types import (
-    CamelModel,
-    EnvironmentGeneric,
+from ethereum_test_types.block_types import EnvironmentGeneric
+from ethereum_test_types.transaction_types import (
     Transaction,
     TransactionFixtureConverter,
 )

src/ethereum_test_fixtures/transaction.py

@@ -4,9 +4,8 @@
 
 from pydantic import Field
 
-from ethereum_test_base_types import Address, Bytes, Hash, ZeroPaddedHexNumber
+from ethereum_test_base_types import Address, Bytes, CamelModel, Hash, ZeroPaddedHexNumber
 from ethereum_test_exceptions import TransactionExceptionInstanceOrList
-from ethereum_test_types.types import CamelModel
 
 from .base import BaseFixture
 

src/ethereum_test_specs/static_state/state_static.py

@@ -6,10 +6,17 @@
 import pytest
 from _pytest.mark.structures import ParameterSet
 
-from ethereum_test_base_types import Address, Hash, HexNumber, Storage, ZeroPaddedHexNumber
+from ethereum_test_base_types import (
+    Account,
+    Address,
+    Hash,
+    HexNumber,
+    Storage,
+    ZeroPaddedHexNumber,
+)
 from ethereum_test_exceptions import TransactionExceptionInstanceOrList
 from ethereum_test_forks import Fork
-from ethereum_test_types import Account, Alloc, Environment, Transaction
+from ethereum_test_types import Alloc, Environment, Transaction
 
 from ..base_static import BaseStaticTest
 from ..state import StateTestFiller

src/ethereum_test_specs/tests/test_expect.py

@@ -5,12 +5,12 @@
 import pytest
 
 from ethereum_clis import TransitionTool
-from ethereum_test_base_types import Account, Address, TestAddress, TestPrivateKey
+from ethereum_test_base_types import Account, Address, Storage, TestAddress, TestPrivateKey
 from ethereum_test_exceptions import TransactionException
 from ethereum_test_fixtures import BlockchainFixture, FixtureFormat, StateFixture
 from ethereum_test_forks import Fork, get_deployed_forks
 from ethereum_test_tools import Block
-from ethereum_test_types import Alloc, Environment, Storage, Transaction, TransactionReceipt
+from ethereum_test_types import Alloc, Environment, Transaction, TransactionReceipt
 
 from ..blockchain import BlockchainEngineFixture, BlockchainTest
 from ..helpers import (

src/ethereum_test_tools/__init__.py

@@ -9,6 +9,7 @@
     Address,
     Bytes,
     Hash,
+    Storage,
     TestAddress,
     TestAddress2,
     TestPrivateKey,
@@ -49,7 +50,6 @@
     NetworkWrappedTransaction,
     Removable,
     Requests,
-    Storage,
     TestParameterGroup,
     Transaction,
     TransactionReceipt,

src/ethereum_test_types/__init__.py

@@ -1,5 +1,11 @@
 """Common definitions and types."""
 
+from .account_types import EOA, Alloc
+from .block_types import (
+    Environment,
+    EnvironmentDefaults,
+    Withdrawal,
+)
 from .helpers import (
     TestParameterGroup,
     add_kzg_version,
@@ -8,63 +14,44 @@
     compute_create_address,
     compute_eofcreate_address,
 )
-from .types import (
-    EOA,
-    Account,
-    Alloc,
-    AuthorizationTuple,
-    Blob,
-    CamelModel,
+from .receipt_types import TransactionReceipt
+from .request_types import (
     ConsolidationRequest,
     DepositRequest,
-    Environment,
-    EnvironmentDefaults,
-    NetworkWrappedTransaction,
-    Removable,
     Requests,
-    Storage,
+    WithdrawalRequest,
+)
+from .transaction_types import (
+    AuthorizationTuple,
+    Blob,
+    NetworkWrappedTransaction,
     Transaction,
     TransactionDefaults,
-    TransactionReceipt,
-    Withdrawal,
-    WithdrawalRequest,
-    keccak256,
 )
+from .utils import Removable, keccak256
 
 __all__ = (
-    "Account",
     "Alloc",
     "AuthorizationTuple",
     "Blob",
-    "CamelModel",
     "ConsolidationRequest",
     "DepositRequest",
-    "EmptyTrieRoot",
     "Environment",
     "EnvironmentDefaults",
     "EOA",
-    "Hash",
-    "HeaderNonce",
-    "HexNumber",
     "NetworkWrappedTransaction",
-    "Number",
     "Removable",
     "Requests",
-    "Storage",
     "TestParameterGroup",
-    "TestPrivateKey",
-    "TestPrivateKey2",
     "Transaction",
     "TransactionDefaults",
     "TransactionReceipt",
     "Withdrawal",
     "WithdrawalRequest",
-    "ZeroPaddedHexNumber",
     "add_kzg_version",
     "ceiling_division",
     "compute_create_address",
     "compute_create2_address",
     "compute_eofcreate_address",
     "keccak256",
-    "to_json",
 )