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

Author: felix314159

amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py

@@ -11,7 +11,6 @@
     Transaction,
     compute_create_address,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
 from ethereum_test_types.block_access_list import (
     BalAccountExpectation,
     BalBalanceChange,
@@ -21,6 +20,7 @@
     BalStorageSlot,
     BlockAccessListExpectation,
 )
+from ethereum_test_vm import Opcodes as Op
 
 from .spec import ref_spec_7928
 

benchmark/helpers.py

@@ -2,7 +2,7 @@
 
 from ethereum_test_forks import Fork
 from ethereum_test_tools import Bytecode
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_vm import Opcodes as Op
 
 
 def code_loop_precompile_call(calldata: Bytecode, attack_block: Bytecode, fork: Fork):

benchmark/test_worst_bytecode.py

@@ -23,8 +23,8 @@
     While,
     compute_create2_address,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
 from ethereum_test_types.helpers import compute_create_address
+from ethereum_test_vm import Opcodes as Op
 
 from .helpers import code_loop_precompile_call
 

benchmark/test_worst_compute.py

@@ -27,9 +27,9 @@
     Transaction,
     add_kzg_version,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
 from ethereum_test_types import TransactionType
-from ethereum_test_vm.opcode import Opcode
+from ethereum_test_vm import Opcode
+from ethereum_test_vm import Opcodes as Op
 
 from ..byzantium.eip198_modexp_precompile.test_modexp import ModExpInput
 from ..cancun.eip4844_blobs.spec import Spec as BlobsSpec

benchmark/test_worst_memory.py

@@ -15,7 +15,7 @@
     StateTestFiller,
     Transaction,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_vm import Opcodes as Op
 
 from .helpers import code_loop_precompile_call
 

benchmark/test_worst_opcode.py

@@ -14,8 +14,8 @@
     StateTestFiller,
     Transaction,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
-from ethereum_test_vm.opcode import Opcode
+from ethereum_test_vm import Opcode
+from ethereum_test_vm import Opcodes as Op
 
 from .helpers import code_loop_precompile_call
 

benchmark/test_worst_stateful_opcodes.py

@@ -25,7 +25,7 @@
     compute_create2_address,
     compute_create_address,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_vm import Opcodes as Op
 
 from .helpers import code_loop_precompile_call
 

berlin/eip2929_gas_cost_increases/test_precompile_warming.py

@@ -21,7 +21,7 @@
     BlockchainTestFiller,
     Transaction,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_vm import Opcodes as Op
 
 REFERENCE_SPEC_GIT_PATH = "EIPS/eip-2929.md"
 REFERENCE_SPEC_VERSION = "0e11417265a623adb680c527b15d0cb6701b870b"

byzantium/eip198_modexp_precompile/test_modexp.py

@@ -15,7 +15,7 @@
     Transaction,
     compute_create_address,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_vm import Opcodes as Op
 
 from .helpers import ModExpInput, ModExpOutput
 

cancun/eip1153_tstore/test_basic_tload.py

@@ -8,7 +8,7 @@
 import pytest
 
 from ethereum_test_tools import Account, Address, Alloc, Environment, StateTestFiller, Transaction
-from ethereum_test_tools.vm.opcode import Opcodes as Op
+from ethereum_test_vm import Opcodes as Op
 
 from .spec import Spec, ref_spec_1153