Skip to content

refactor(testing): unify the three attestation spec files into one module #849

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.

Sign up for GitHub

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
tcoratger merged 2 commits into from
Jun 5, 2026
Merged

refactor(testing): unify the three attestation spec files into one module #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d49ce6
refactor(testing): unify the three attestation spec files into one mo…
tcoratger Jun 5, 2026
ab183e3
docs(testing): tighten attestation spec docstrings
tcoratger Jun 5, 2026
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
2 changes: 0 additions & 2 deletions packages/testing/src/consensus_testing/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
BlockSpec,
BlockStep,
ForkChoiceStep,
GossipAggregatedAttestationSpec,
GossipAggregatedAttestationStep,
GossipAttestationSpec,
StateExpectation,
Expand All @@ -62,7 +61,6 @@
__all__ = [
# Public API
"AggregatedAttestationSpec",
"GossipAggregatedAttestationSpec",
"GossipAttestationSpec",
"BlockSpec",
"forks",
Expand Down
4 changes: 2 additions & 2 deletions packages/testing/src/consensus_testing/test_fixtures/state_transition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def _build_block_from_spec(
forced = [
AggregatedAttestation(
aggregation_bits=AggregationBits.from_indices(fa.validator_indices),
data=fa.build_attestation_data(block_registry, state),
data=fa.build_attestation_data(block_registry, state.latest_justified),
)
for fa in spec.forced_attestations
]
Expand Down Expand Up @@ -334,7 +334,7 @@ def _build_aggregated_payloads_from_spec(
if spec.signer_ids is not None:
raise NotImplementedError("signer_ids not yet supported in StateTransitionTest")

attestation_data = spec.build_attestation_data(block_registry, state)
attestation_data = spec.build_attestation_data(block_registry, state.latest_justified)
proof = key_manager.sign_and_aggregate(spec.validator_indices, attestation_data)
payloads.setdefault(attestation_data, set()).add(proof)

Expand Down
10 changes: 4 additions & 6 deletions packages/testing/src/consensus_testing/test_types/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
"""Test types for consensus test fixtures."""

from consensus_testing.test_types.aggregated_attestation_spec import AggregatedAttestationSpec
from consensus_testing.test_types.block_spec import BlockSpec
from consensus_testing.test_types.gossip_aggregated_attestation_spec import (
GossipAggregatedAttestationSpec,
from consensus_testing.test_types.attestation_specs import (
AggregatedAttestationSpec,
GossipAttestationSpec,
)
from consensus_testing.test_types.gossip_attestation_spec import GossipAttestationSpec
from consensus_testing.test_types.block_spec import BlockSpec
from consensus_testing.test_types.state_expectation import StateExpectation
from consensus_testing.test_types.step_types import (
AttestationStep,
Expand All @@ -24,7 +23,6 @@
__all__ = [
"AggregatedAttestationSpec",
"GossipAttestationSpec",
"GossipAggregatedAttestationSpec",
"StateExpectation",
"StoreChecks",
"AttestationCheck",
Expand Down
217 changes: 0 additions & 217 deletions packages/testing/src/consensus_testing/test_types/aggregated_attestation_spec.py
View file
Open in desktop

This file was deleted.

Loading
Loading