Skip to content

all: Abstract fixtures, StateTest refactor #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/ethereum_test_tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@
AccessList,
Account,
Auto,
Block,
EngineAPIError,
Environment,
Fixture,
FixtureEngineNewPayload,
Header,
HistoryStorageAddress,
HiveFixture,
JSONEncoder,
Removable,
Storage,
Expand All @@ -46,22 +41,24 @@
to_hash,
to_hash_bytes,
)
from .filling.fill import fill_test
from .reference_spec import ReferenceSpec, ReferenceSpecTypes
from .spec import (
BaseFixture,
BaseTest,
BaseTestConfig,
BlockchainTest,
BlockchainTestFiller,
StateTest,
StateTestFiller,
)
from .spec.blockchain.types import Block, Header
from .vm import Opcode, OpcodeCallArg, Opcodes

__all__ = (
"AccessList",
"Account",
"Auto",
"BaseFixture",
"BaseTest",
"BaseTestConfig",
"Block",
Expand Down Expand Up @@ -107,7 +104,6 @@
"cost_memory_bytes",
"eip_2028_transaction_data_cost",
"eip_2028_transaction_data_cost",
"fill_test",
"to_address",
"to_hash_bytes",
"to_hash",
Expand Down
18 changes: 1 addition & 17 deletions src/ethereum_test_tools/common/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,18 @@
to_hash,
to_hash_bytes,
)
from .json import to_json
from .types import (
AccessList,
Account,
Address,
Alloc,
Auto,
Block,
Bloom,
Bytes,
Environment,
Fixture,
FixtureBlock,
FixtureEngineNewPayload,
FixtureHeader,
Hash,
Header,
HeaderNonce,
HiveFixture,
InvalidFixtureBlock,
JSONEncoder,
Number,
Removable,
Expand All @@ -53,7 +46,6 @@
alloc_to_accounts,
serialize_transactions,
str_or_none,
to_json,
withdrawals_root,
)

Expand All @@ -65,22 +57,14 @@
"AddrBB",
"Alloc",
"Auto",
"Block",
"Bloom",
"Bytes",
"EngineAPIError",
"EmptyTrieRoot",
"Environment",
"Fixture",
"FixtureBlock",
"FixtureEngineNewPayload",
"FixtureHeader",
"Hash",
"Header",
"HeaderNonce",
"HistoryStorageAddress",
"HiveFixture",
"InvalidFixtureBlock",
"JSONEncoder",
"Number",
"Removable",
Expand Down
Loading