src/ethereum_test_tools/vm folder removed, src/ethereum_test_vm/opcode.py renamed to opcodes.py, test imports modified

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.

src/ethereum_clis/tests/test_transition_tools_support.py

@@ -31,8 +31,8 @@
     Withdrawal,
     add_kzg_version,
 )
-from ethereum_test_tools.vm.opcode import Opcodes as Op
 from ethereum_test_types import Alloc
+from ethereum_test_vm import Opcodes as Op
 
 BLOB_COMMITMENT_VERSION_KZG = 1
 

src/ethereum_test_tools/vm/__init__.py

@@ -3,7 +3,7 @@
 from .bytecode import Bytecode
 from .evm_types import EVMCodeType
 from .helpers import call_return_code
-from .opcode import Macro, Macros, Opcode, OpcodeCallArg, Opcodes, UndefinedOpcodes
+from .opcodes import Macro, Macros, Opcode, OpcodeCallArg, Opcodes, UndefinedOpcodes
 
 __all__ = (
     "Bytecode",

src/ethereum_test_tools/vm/opcode.py

@@ -1,6 +1,6 @@
 """Helper functions for the EVM."""
 
-from .opcode import Opcodes as Op
+from .opcodes import Opcodes as Op
 
 
 def call_return_code(opcode: Op, success: bool, *, revert: bool = False) -> int:

src/ethereum_test_vm/__init__.py

@@ -4,9 +4,9 @@
 
 from ethereum_test_base_types import Address
 
-from ..opcode import Bytecode
-from ..opcode import Macros as Om
-from ..opcode import Opcodes as Op
+from ..opcodes import Bytecode
+from ..opcodes import Macros as Om
+from ..opcodes import Opcodes as Op
 
 
 @pytest.mark.parametrize(

src/ethereum_test_vm/helpers.py

@@ -232,7 +232,7 @@ class StateTest(FormattedTest):  # noqa: D101
             StateTestFiller,
             Transaction
         )
-        from ethereum_test_tools.vm.opcode import Opcodes as Op
+        from ethereum_test_vm import Opcodes as Op
 
         @pytest.mark.valid_from("Istanbul")
         def test_chainid(state_test: StateTestFiller, pre: Alloc):
@@ -269,7 +269,7 @@ class BlockchainTest(FormattedTest):  # noqa: D101
             Environment,
             Transaction
         )
-        from ethereum_test_tools.vm.opcode import Opcodes as Op
+        from ethereum_test_vm import Opcodes as Op
 
         @pytest.mark.valid_from("Istanbul")
         def test_chainid_blockchain(blockchain_test: BlockchainTestFiller, pre: Alloc):

src/ethereum_test_vm/opcode.py src/ethereum_test_vm/opcodes.pysrc/ethereum_test_vm/opcode.py renamed to src/ethereum_test_vm/opcodes.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