refactor: update import path

LouisTsai-Csie · LouisTsai-Csie · commit 8efe2d308405 · 2025-10-29T15:41:27.000+08:00
diff --git a/tests/benchmark/compute/helpers.py b/tests/benchmark/compute/helpers.py
@@ -4,9 +4,7 @@
 from enum import Enum, auto
 from typing import cast
 
-from ethereum_test_base_types.base_types import Hash
-from ethereum_test_forks import Fork
-from ethereum_test_vm import Opcodes as Op
+from execution_testing import Fork, Hash, Op
 
 from tests.osaka.eip7951_p256verify_precompiles.spec import FieldElement
 from tests.prague.eip2537_bls_12_381_precompiles.spec import (
diff --git a/tests/benchmark/compute/instruction/arithmetic.py b/tests/benchmark/compute/instruction/arithmetic.py
@@ -4,15 +4,15 @@
 import random
 
 import pytest
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Alloc,
     BenchmarkTestFiller,
     Bytecode,
+    Fork,
     JumpLoopGenerator,
+    Op,
     Transaction,
 )
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import DEFAULT_BINOP_ARGS, make_dup, neg
 
diff --git a/tests/benchmark/compute/instruction/bitwise.py b/tests/benchmark/compute/instruction/bitwise.py
@@ -4,15 +4,15 @@
 from typing import Callable
 
 import pytest
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Alloc,
     BenchmarkTestFiller,
     Bytecode,
+    Fork,
     JumpLoopGenerator,
+    Op,
     Transaction,
 )
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import (
     DEFAULT_BINOP_ARGS,
diff --git a/tests/benchmark/compute/instruction/block.py b/tests/benchmark/compute/instruction/block.py
@@ -1,12 +1,12 @@
 """Benchmark block instructions."""
 
 import pytest
-from ethereum_test_tools import (
+from execution_testing import (
     BenchmarkTestFiller,
     Block,
     ExtCallGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 # Block instructions:
 # BLOCKHASH, COINBASE, TIMESTAMP, NUMBER, PREVRANDAO, GASLIMIT, CHAINID
diff --git a/tests/benchmark/compute/instruction/comparison.py b/tests/benchmark/compute/instruction/comparison.py
@@ -1,11 +1,11 @@
 """Benchmark comparison instructions."""
 
 import pytest
-from ethereum_test_tools import (
+from execution_testing import (
     BenchmarkTestFiller,
     JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 # Comparison instructions:
 # LT, SLT, GT, SGT, EQ, ISZERO
diff --git a/tests/benchmark/compute/instruction/control_flow.py b/tests/benchmark/compute/instruction/control_flow.py
@@ -1,13 +1,13 @@
 """Benchmark control flow instructions."""
 
-from ethereum_test_tools import (
+from execution_testing import (
     Alloc,
     BenchmarkTestFiller,
     ExtCallGenerator,
     JumpLoopGenerator,
+    Op,
     Transaction,
 )
-from ethereum_test_vm import Opcodes as Op
 
 # Control flow instructions:
 # STOP, JUMP, JUMPI, PC, GAS, JUMPDEST
diff --git a/tests/benchmark/compute/instruction/environment.py b/tests/benchmark/compute/instruction/environment.py
@@ -4,34 +4,33 @@
 from typing import Any, Dict
 
 import pytest
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Account,
     Address,
     Alloc,
+    BenchmarkTestFiller,
     Block,
     BlockchainTestFiller,
     Bytecode,
     Bytes,
     Environment,
+    ExtCallGenerator,
+    Fork,
     Hash,
+    JumpLoopGenerator,
+    Op,
     Transaction,
+    TransactionType,
     While,
+    add_kzg_version,
     compute_create2_address,
 )
-from ethereum_test_types import TransactionType, add_kzg_version
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import (
     XOR_TABLE,
     CallDataOrigin,
     ReturnDataStyle,
 )
-from tests.benchmark.test_worst_compute import (
-    BenchmarkTestFiller,
-    ExtCallGenerator,
-    JumpLoopGenerator,
-)
 from tests.cancun.eip4844_blobs.spec import Spec as BlobsSpec
 
 # Environmental instructions:
diff --git a/tests/benchmark/compute/instruction/keccak.py b/tests/benchmark/compute/instruction/keccak.py
@@ -2,12 +2,12 @@
 
 import math
 
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     BenchmarkTestFiller,
+    Fork,
     JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 # Keccak instructions:
 # KECCAK256
diff --git a/tests/benchmark/compute/instruction/log.py b/tests/benchmark/compute/instruction/log.py
@@ -1,13 +1,12 @@
 """Benchmark log instructions."""
 
 import pytest
-from ethereum_test_tools import (
+from execution_testing import (
     BenchmarkTestFiller,
     Bytecode,
     JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcode
-from ethereum_test_vm import Opcodes as Op
 
 # Log instructions:
 # LOG0, LOG1, LOG2, LOG3, LOG4
@@ -41,7 +40,7 @@
 @pytest.mark.parametrize("fixed_offset", [True, False])
 def test_log(
     benchmark_test: BenchmarkTestFiller,
-    opcode: Opcode,
+    opcode: Op,
     zeros_topic: bool,
     size: int,
     fixed_offset: bool,
diff --git a/tests/benchmark/compute/instruction/memory.py b/tests/benchmark/compute/instruction/memory.py
@@ -1,13 +1,13 @@
 """Benchmark memory instructions."""
 
 import pytest
-from ethereum_test_tools import (
+from execution_testing import (
     BenchmarkTestFiller,
     Bytecode,
     ExtCallGenerator,
     JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 # Memory instructions:
 # MSTORE, MSTORE8, MLOAD, MSIZE, MCOPY
diff --git a/tests/benchmark/compute/instruction/stack.py b/tests/benchmark/compute/instruction/stack.py
@@ -1,14 +1,14 @@
 """Benchmark stack instructions."""
 
 import pytest
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Alloc,
     BenchmarkTestFiller,
     ExtCallGenerator,
+    Fork,
     JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 # Stack instructions:
 # POP, PUSHx, DUPx, SWAPx
diff --git a/tests/benchmark/compute/instruction/storage.py b/tests/benchmark/compute/instruction/storage.py
@@ -1,20 +1,20 @@
 """Benchmark storage instructions."""
 
 import pytest
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Alloc,
     BenchmarkTestFiller,
     Block,
     Bytecode,
     Environment,
+    Fork,
     JumpLoopGenerator,
+    Op,
+    TestPhaseManager,
     Transaction,
     While,
     compute_create_address,
 )
-from ethereum_test_types import TestPhaseManager
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import StorageAction, TransactionResult
 
diff --git a/tests/benchmark/compute/instruction/system.py b/tests/benchmark/compute/instruction/system.py
@@ -3,24 +3,24 @@
 import math
 
 import pytest
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Account,
     Alloc,
     BenchmarkTestFiller,
     Block,
     BlockchainTestFiller,
     Bytecode,
     Environment,
+    Fork,
     Hash,
     JumpLoopGenerator,
+    Op,
     StateTestFiller,
     Transaction,
     While,
     compute_create2_address,
     compute_create_address,
 )
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import XOR_TABLE
 
diff --git a/tests/benchmark/compute/precompile/alt_bn128.py b/tests/benchmark/compute/precompile/alt_bn128.py
@@ -3,10 +3,14 @@
 import random
 
 import pytest
-from ethereum_test_benchmark import JumpLoopGenerator
-from ethereum_test_forks import Fork
-from ethereum_test_tools import Address, BenchmarkTestFiller, Bytes
-from ethereum_test_vm import Opcodes as Op
+from execution_testing import (
+    Address,
+    BenchmarkTestFiller,
+    Bytes,
+    Fork,
+    JumpLoopGenerator,
+    Op,
+)
 from py_ecc.bn128 import G1, G2, multiply
 
 from tests.benchmark.compute.helpers import concatenate_parameters
diff --git a/tests/benchmark/compute/precompile/blake2f.py b/tests/benchmark/compute/precompile/blake2f.py
@@ -1,13 +1,13 @@
 """Benchmark BLAKE2F precompile."""
 
 import pytest
-from ethereum_test_benchmark import JumpLoopGenerator
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Address,
     BenchmarkTestFiller,
+    Fork,
+    JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import concatenate_parameters
 from tests.istanbul.eip152_blake2.common import Blake2bInput
diff --git a/tests/benchmark/compute/precompile/bls12_381.py b/tests/benchmark/compute/precompile/bls12_381.py
@@ -1,13 +1,13 @@
 """Benchmark BLS12_381 precompile."""
 
 import pytest
-from ethereum_test_benchmark import JumpLoopGenerator
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Address,
     BenchmarkTestFiller,
+    Fork,
+    JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import concatenate_parameters
 from tests.prague.eip2537_bls_12_381_precompiles import spec as bls12381_spec
diff --git a/tests/benchmark/compute/precompile/ecrecover.py b/tests/benchmark/compute/precompile/ecrecover.py
@@ -1,13 +1,13 @@
 """Benchmark ECRECOVER precompile."""
 
 import pytest
-from ethereum_test_benchmark import JumpLoopGenerator
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Address,
     BenchmarkTestFiller,
+    Fork,
+    JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import concatenate_parameters
 
diff --git a/tests/benchmark/compute/precompile/identity.py b/tests/benchmark/compute/precompile/identity.py
@@ -1,11 +1,11 @@
 """Benchmark IDENTITY precompile."""
 
-from ethereum_test_benchmark import JumpLoopGenerator
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     BenchmarkTestFiller,
+    Fork,
+    JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import calculate_optimal_input_length
 
diff --git a/tests/benchmark/compute/precompile/modexp.py b/tests/benchmark/compute/precompile/modexp.py
@@ -2,11 +2,11 @@
 
 import pytest
 from _pytest.mark import ParameterSet
-from ethereum_test_tools import (
+from execution_testing import (
     BenchmarkTestFiller,
     JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 from tests.byzantium.eip198_modexp_precompile.helpers import ModExpInput
 
diff --git a/tests/benchmark/compute/precompile/p256verify.py b/tests/benchmark/compute/precompile/p256verify.py
@@ -1,13 +1,13 @@
 """Benchmark P256VERIFY precompile."""
 
 import pytest
-from ethereum_test_benchmark import JumpLoopGenerator
-from ethereum_test_forks import Fork
-from ethereum_test_tools import (
+from execution_testing import (
     Address,
     BenchmarkTestFiller,
+    Fork,
+    JumpLoopGenerator,
+    Op,
 )
-from ethereum_test_vm import Opcodes as Op
 
 from tests.benchmark.compute.helpers import concatenate_parameters
 from tests.osaka.eip7951_p256verify_precompiles import spec as p256verify_spec
diff --git a/tests/benchmark/compute/precompile/point_evaluation.py b/tests/benchmark/compute/precompile/point_evaluation.py
diff --git a/tests/benchmark/compute/precompile/ripemd160.py b/tests/benchmark/compute/precompile/ripemd160.py
diff --git a/tests/benchmark/compute/precompile/sha256.py b/tests/benchmark/compute/precompile/sha256.py
diff --git a/tests/benchmark/compute/scenario/mix_operations.py b/tests/benchmark/compute/scenario/mix_operations.py
diff --git a/tests/benchmark/compute/scenario/transaction_types.py b/tests/benchmark/compute/scenario/transaction_types.py
