refactor(consume): move helper modules to a new helpers sub-package

Author: danceratopz

src/cli/extract_config.py

@@ -23,7 +23,7 @@
 from ethereum_test_fixtures.file import Fixtures
 from ethereum_test_fixtures.pre_alloc_groups import PreAllocGroup
 from ethereum_test_forks import Fork
-from pytest_plugins.consume.hive_simulators.ruleset import ruleset
+from pytest_plugins.consume.simulators.helpers.ruleset import ruleset
 
 
 def get_docker_containers() -> set[str]:

src/pytest_plugins/consume/simulators/conftest.py

@@ -24,11 +24,13 @@
 from ethereum_test_fixtures.file import Fixtures
 from ethereum_test_rpc import EthRPC
 from pytest_plugins.consume.consume import FixturesSource
-from pytest_plugins.consume.simulators.ruleset import ruleset  # TODO: generate dynamically
+from pytest_plugins.consume.simulators.helpers.ruleset import (
+    ruleset,  # TODO: generate dynamically
+)
 from pytest_plugins.pytest_hive.hive_info import ClientFile, HiveInfo
 
-from .exceptions import EXCEPTION_MAPPERS
-from .timing import TimingData
+from .helpers.exceptions import EXCEPTION_MAPPERS
+from .helpers.timing import TimingData
 
 logger = logging.getLogger(__name__)
 

src/pytest_plugins/consume/simulators/engine/test_via_engine.py

@@ -9,10 +9,10 @@
 from ethereum_test_fixtures import BlockchainEngineFixture
 from ethereum_test_rpc import EngineRPC, EthRPC
 from ethereum_test_rpc.types import ForkchoiceState, JSONRPCError, PayloadStatusEnum
-from pytest_plugins.consume.simulators.exceptions import GenesisBlockMismatchExceptionError
+from pytest_plugins.consume.simulators.helpers.exceptions import GenesisBlockMismatchExceptionError
 from pytest_plugins.logging import get_logger
 
-from ..timing import TimingData
+from ..helpers.timing import TimingData
 
 logger = get_logger(__name__)
 

src/pytest_plugins/consume/simulators/helpers/__init__.py

@@ -0,0 +1 @@
+"""Helper classes and functions for consume hive simulators."""

src/pytest_plugins/consume/simulators/exceptions.py renamed to src/pytest_plugins/consume/simulators/helpers/exceptions.py

@@ -9,9 +9,9 @@
 
 from ethereum_test_fixtures import BlockchainFixture
 from ethereum_test_rpc import EthRPC
-from pytest_plugins.consume.simulators.exceptions import GenesisBlockMismatchExceptionError
+from pytest_plugins.consume.simulators.helpers.exceptions import GenesisBlockMismatchExceptionError
 
-from ..timing import TimingData
+from ..helpers.timing import TimingData
 
 logger = logging.getLogger(__name__)
 

src/pytest_plugins/consume/simulators/ruleset.py renamed to src/pytest_plugins/consume/simulators/helpers/ruleset.py

@@ -39,7 +39,7 @@
     Withdrawal,
 )
 from ethereum_test_types import Requests
-from pytest_plugins.consume.simulators.ruleset import ruleset
+from pytest_plugins.consume.simulators.helpers.ruleset import ruleset
 
 
 class HashList(RootModel[List[Hash]]):