chore(all): rename shadowed modules to enable ruff a005 (#2133)

Author: felix314159

docs/writing_tests/tutorials/state_transition.md

@@ -32,7 +32,7 @@ In Python, multi-line strings are denoted using `"""`. As a convention, a file's
 import pytest
 
 from ethereum_test_tools import Account, Alloc, Environment, StateTestFiller, Transaction
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_vm import Opcodes as Op
 ```
 
 In this snippet the required constants, types and helper functions are imported from `ethereum_test_tools`. The `Opcodes` class (aliased as `Op`) provides the Python minilang for writing EVM bytecode. We will go over these as we come across them.

docs/writing_tests/writing_a_new_test.md

@@ -176,10 +176,10 @@ For a full list of available opcodes and their usage, see [`Opcodes`][ethereum_t
 
 #### Higher-Level Constructs
 
-For more complex control flow, you can use constructs like [`Switch`][ethereum_test_tools.code.generators.Switch] and [`Case`][ethereum_test_tools.code.generators.Case] from the `ethereum_test_tools.code.generators` module:
+For more complex control flow, you can use constructs like [`Switch`][ethereum_test_tools.tools_code.generators.Switch] and [`Case`][ethereum_test_tools.tools_code.generators.Case] from the `ethereum_test_tools.tools_code.generators` module:
 
 ```python
-from ethereum_test_tools.code.generators import Switch, Case
+from ethereum_test_tools.tools_code.generators import Switch, Case
 from ethereum_test_vm.opcode import Opcodes as Op
 
 code = Switch(
@@ -191,7 +191,7 @@ code = Switch(
 )
 ```
 
-The `ethereum_test_tools.code.generators` module also defines other high-level constructs like [`While`][ethereum_test_tools.code.generators.While] and [`Conditional`][ethereum_test_tools.code.generators.Conditional].
+The `ethereum_test_tools.tools_code.generators` module also defines other high-level constructs like [`While`][ethereum_test_tools.tools_code.generators.While] and [`Conditional`][ethereum_test_tools.tools_code.generators.Conditional].
 
 #### Converting Bytecode to Minilang
 

pyproject.toml

@@ -129,7 +129,7 @@ line-length = 99
 [tool.ruff.lint]
 select = ["E", "F", "B", "W", "I", "A", "N", "D", "C"]
 fixable = ["I", "B", "E", "F", "W", "D", "C"]
-ignore = ["D205", "D203", "D212", "D415", "C901", "A005"]
+ignore = ["D205", "D203", "D212", "D415", "C420", "C901"]
 
 [tool.mypy]
 disable_error_code = ["import-untyped"]

src/cli/eest/make/templates/blockchain_test.py.j2

@@ -14,7 +14,7 @@ from ethereum_test_tools import (
     Environment,
     Transaction,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_vm import Opcodes as Op
 
 REFERENCE_SPEC_GIT_PATH = "DUMMY/eip-DUMMY.md"
 REFERENCE_SPEC_VERSION = "DUMMY_VERSION"

src/cli/eest/make/templates/state_test.py.j2

@@ -7,7 +7,7 @@ import pytest
 
 from ethereum_test_forks import Fork
 from ethereum_test_tools import Account, Alloc, Environment, StateTestFiller, Transaction
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_vm import Opcodes as Op
 
 REFERENCE_SPEC_GIT_PATH = "DUMMY/eip-DUMMY.md"
 REFERENCE_SPEC_VERSION = "DUMMY_VERSION"

src/cli/eofwrap.py

@@ -33,7 +33,7 @@
 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_vm.bytecode import Bytecode
+from ethereum_test_vm import Bytecode
 
 from .evm_bytes import OpcodeWithOperands, process_evm_bytes
 

src/cli/evm_bytes.py

@@ -6,9 +6,8 @@
 import click
 
 from ethereum_test_base_types import ZeroPaddedHexNumber
-from ethereum_test_vm import Macro
+from ethereum_test_vm import Bytecode, Macro
 from ethereum_test_vm import Opcodes as Op
-from ethereum_test_vm.bytecode import Bytecode
 
 OPCODES_WITH_EMPTY_LINES_AFTER = {
     Op.STOP,

src/cli/gentest/request_manager.py

@@ -15,7 +15,7 @@
 from config import EnvConfig
 from ethereum_test_base_types import Hash
 from ethereum_test_rpc import BlockNumberType, DebugRPC, EthRPC
-from ethereum_test_rpc.types import TransactionByHashResponse
+from ethereum_test_rpc.rpc_types import TransactionByHashResponse
 from ethereum_test_types import Environment
 
 

src/cli/gentest/test_context_providers.py

@@ -19,7 +19,7 @@
 from pydantic import BaseModel
 
 from ethereum_test_base_types import Account, Hash
-from ethereum_test_rpc.types import TransactionByHashResponse
+from ethereum_test_rpc.rpc_types import TransactionByHashResponse
 from ethereum_test_tools import Environment, Transaction
 
 from .request_manager import RPCRequest

src/cli/gentest/test_providers.py

@@ -17,7 +17,7 @@
 from pydantic import BaseModel
 
 from ethereum_test_base_types import Account, Address, ZeroPaddedHexNumber
-from ethereum_test_rpc.types import TransactionByHashResponse
+from ethereum_test_rpc.rpc_types import TransactionByHashResponse
 from ethereum_test_types import Environment