Skip to content
Merged
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
15 changes: 9 additions & 6 deletions src/cli/eofwrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ class EofWrapper:
FIXTURES_CANT_WRAP = "fixtures_cant_wrap"
# Test fixtures with EOF code but test doesn't pass and generation fails
FIXTURES_CANT_GENERATE = "fixtures_cant_generate"
# Invalid blocks in fixtures skipped
INVALID_BLOCKS_SKIPPED = "invalid_blocks_skipped"
# State accounts with code wrapped into valid EOF
ACCOUNTS_WRAPPED = "accounts_wrapped"
# State accounts with code wrapped into valid unique EOF
Expand All @@ -111,6 +113,7 @@ def __init__(self):
self.FIXTURES_GENERATED: 0,
self.FIXTURES_CANT_WRAP: 0,
self.FIXTURES_CANT_GENERATE: 0,
self.INVALID_BLOCKS_SKIPPED: 0,
self.ACCOUNTS_WRAPPED: 0,
self.UNIQUE_ACCOUNTS_WRAPPED: 0,
self.ACCOUNTS_INVALID_EOF: 0,
Expand Down Expand Up @@ -283,16 +286,16 @@ def _wrap_fixture(self, fixture: BlockchainFixture, traces: bool):
**fixture_tx_dump,
)
block.txs.append(tx)

test.blocks.append(block)
elif isinstance(fixture_block, InvalidFixtureBlock):
block = Block(
rlp=fixture_block.rlp,
exception=fixture_block.expect_exception,
)
# Skip - invalid blocks are not supported. Reason: FixtureTransaction doesn't
# support expected exception. But we can continue and test the remaining
# blocks.
self.metrics[self.INVALID_BLOCKS_SKIPPED] += 1
else:
raise TypeError("not a FixtureBlock")

test.blocks.append(block)

result = test.generate(
request=None, # type: ignore
t8n=t8n,
Expand Down
Loading