Skip to content

Commit df66f95

Browse files
committed
refactor(tests): Remove ethereum_test_tools.eof, use ethereum_test_types.eof everywhere
1 parent e0cd6da commit df66f95

File tree

55 files changed

+69
-148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+69
-148
lines changed

src/ethereum_test_tools/eof/__init__.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/ethereum_test_tools/eof/constants.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/ethereum_test_tools/eof/v1/__init__.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/ethereum_test_tools/eof/v1/constants.py

Lines changed: 0 additions & 43 deletions
This file was deleted.

tests/cancun/eip1153_tstore/test_tstorage_clear_after_tx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
Initcode,
1818
Transaction,
1919
)
20-
from ethereum_test_tools.eof.v1 import Container
2120
from ethereum_test_tools.vm.opcode import Opcodes as Op
21+
from ethereum_test_types.eof.v1 import Container
2222

2323
from .spec import ref_spec_1153
2424

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_all_opcodes_in_container.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
from ethereum_test_tools import EOFException, EOFTestFiller, Opcode, UndefinedOpcodes
99
from ethereum_test_tools import Opcodes as Op
10-
from ethereum_test_tools.eof.v1 import Container, ContainerKind, Section
11-
from ethereum_test_tools.eof.v1.constants import MAX_STACK_INCREASE_LIMIT
1210
from ethereum_test_types.eof.constants import MAX_RUNTIME_STACK_HEIGHT
11+
from ethereum_test_types.eof.v1 import Container, ContainerKind, Section
12+
from ethereum_test_types.eof.v1.constants import MAX_STACK_INCREASE_LIMIT
1313
from ethereum_test_vm import Bytecode
1414

1515
from .. import EOF_FORK_NAME

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_container_size.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
from ethereum_test_tools import EOFException, EOFTestFiller
66
from ethereum_test_tools import Opcodes as Op
7-
from ethereum_test_tools.eof.v1 import Container, Section
8-
from ethereum_test_tools.eof.v1.constants import MAX_INITCODE_SIZE
7+
from ethereum_test_types.eof.v1 import Container, Section
8+
from ethereum_test_types.eof.v1.constants import MAX_INITCODE_SIZE
99

1010
from .. import EOF_FORK_NAME
1111

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_container_validation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
import pytest
66

77
from ethereum_test_tools import EOFException, EOFTestFiller
8-
from ethereum_test_tools.eof.v1 import (
8+
from ethereum_test_tools.vm.opcode import Opcodes as Op
9+
from ethereum_test_types.eof.v1 import (
910
AutoSection,
1011
Container,
1112
ContainerKind,
1213
Section,
1314
SectionKind,
1415
)
15-
from ethereum_test_tools.eof.v1.constants import (
16+
from ethereum_test_types.eof.v1.constants import (
1617
MAX_CODE_INPUTS,
1718
MAX_CODE_OUTPUTS,
1819
MAX_CODE_SECTIONS,
1920
MAX_STACK_INCREASE_LIMIT,
2021
)
21-
from ethereum_test_tools.vm.opcode import Opcodes as Op
2222

2323
from .. import EOF_FORK_NAME
2424

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_eof_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from ethereum_test_tools import Bytecode, EOFException, EOFTestFiller
66
from ethereum_test_tools import Opcodes as Op
7-
from ethereum_test_tools.eof.v1 import AutoSection, Container, Section
7+
from ethereum_test_types.eof.v1 import AutoSection, Container, Section
88

99
from .. import EOF_FORK_NAME
1010

tests/osaka/eip7692_eof_v1/eip3540_eof_v1/test_execution.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
from ethereum_test_base_types import Storage
66
from ethereum_test_tools import Account, Alloc, Environment, StateTestFiller, Transaction
7-
from ethereum_test_tools.eof.v1 import Container, Section
87
from ethereum_test_tools.vm.opcode import Opcodes as Op
8+
from ethereum_test_types.eof.v1 import Container, Section
99

1010
from .. import EOF_FORK_NAME
1111

0 commit comments

Comments
 (0)