types shadowing fixed

Author: felix314159

docs/writing_tests/tutorials/state_transition.md

@@ -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"]

docs/writing_tests/writing_a_new_test.md

@@ -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"

pyproject.toml

@@ -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/eest/make/templates/blockchain_test.py.j2

@@ -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/eest/make/templates/state_test.py.j2

@@ -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/request_manager.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
 
 

src/cli/gentest/test_context_providers.py

@@ -8,6 +8,6 @@ addopts =
     -p pytest_plugins.concurrency
     # disable pytest built-in logging entirely `-p no:logging`
     -p no:logging
-    -p pytest_plugins.logging.logging
+    -p pytest_plugins.custom_logging.plugin_logging
     -p pytest_plugins.consume.consume
     -p pytest_plugins.help.help

src/cli/gentest/test_providers.py

@@ -6,7 +6,7 @@ python_files = *.py
 addopts = 
     -p pytest_plugins.execute.eth_config.eth_config
     -p pytest_plugins.help.help
-    -p pytest_plugins.logging.logging
+    -p pytest_plugins.custom_logging.plugin_logging
     -m "not eip_version_check"
     --tb short
     --dist loadscope