gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 17:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra

Browse Source
This commit is contained in:
realbigsean
2024-05-09 13:45:46 -04:00
parent 3ea3d226e1 07229b76ed
commit 36a559e11a
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
testing/ef_tests/src/type_name.rs
View File

@@ -111,11 +111,8 @@ type_name_generic!(LightClientUpdateDeneb, "LightClientUpdate");
type_name_generic!(PendingAttestation); type_name_generic!(PendingAttestation);
type_name!(ProposerSlashing); type_name!(ProposerSlashing);
type_name_generic!(SignedAggregateAndProof); type_name_generic!(SignedAggregateAndProof);
type_name_generic!(SignedAggregateAndProofBase, "SignedAggregateAndProofBase"); type_name_generic!(SignedAggregateAndProofBase, "SignedAggregateAndProof");
type_name_generic!( type_name_generic!(SignedAggregateAndProofElectra, "SignedAggregateAndProof");
SignedAggregateAndProofElectra,
"SignedAggregateAndProofElectra"
);
type_name_generic!(SignedBeaconBlock); type_name_generic!(SignedBeaconBlock);
type_name!(SignedBeaconBlockHeader); type_name!(SignedBeaconBlockHeader);
type_name_generic!(SignedContributionAndProof); type_name_generic!(SignedContributionAndProof);

49
testing/ef_tests/tests/tests.rs
View File

@@ -219,7 +219,6 @@ mod ssz_static {
use types::historical_summary::HistoricalSummary; use types::historical_summary::HistoricalSummary;
use types::{AttesterSlashingBase, AttesterSlashingElectra, LightClientBootstrapAltair, *}; use types::{AttesterSlashingBase, AttesterSlashingElectra, LightClientBootstrapAltair, *};
ssz_static_test!(aggregate_and_proof, AggregateAndProof<_>);
ssz_static_test!(attestation, Attestation<_>); ssz_static_test!(attestation, Attestation<_>);
ssz_static_test!(attestation_data, AttestationData); ssz_static_test!(attestation_data, AttestationData);
ssz_static_test!(beacon_block, SszStaticWithSpecHandler, BeaconBlock<_>); ssz_static_test!(beacon_block, SszStaticWithSpecHandler, BeaconBlock<_>);
@@ -249,7 +248,7 @@ mod ssz_static {
ssz_static_test!(voluntary_exit, VoluntaryExit); ssz_static_test!(voluntary_exit, VoluntaryExit);
#[test] #[test]
fn signed_aggregate_and_proof() { fn attester_slashing() {
SszStaticHandler::<AttesterSlashingBase<MinimalEthSpec>, MinimalEthSpec>::pre_electra() SszStaticHandler::<AttesterSlashingBase<MinimalEthSpec>, MinimalEthSpec>::pre_electra()
.run(); .run();
SszStaticHandler::<AttesterSlashingBase<MainnetEthSpec>, MainnetEthSpec>::pre_electra() SszStaticHandler::<AttesterSlashingBase<MainnetEthSpec>, MainnetEthSpec>::pre_electra()
@@ -260,6 +259,36 @@ mod ssz_static {
.run(); .run();
} }
#[test]
fn signed_aggregate_and_proof() {
SszStaticHandler::<SignedAggregateAndProofBase<MinimalEthSpec>, MinimalEthSpec>::pre_electra(
)
.run();
SszStaticHandler::<SignedAggregateAndProofBase<MainnetEthSpec>, MainnetEthSpec>::pre_electra(
)
.run();
SszStaticHandler::<SignedAggregateAndProofElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only(
)
.run();
SszStaticHandler::<SignedAggregateAndProofElectra<MainnetEthSpec>, MainnetEthSpec>::electra_only(
)
.run();
}
#[test]
fn aggregate_and_proof() {
SszStaticHandler::<AggregateAndProofBase<MinimalEthSpec>, MinimalEthSpec>::pre_electra()
.run();
SszStaticHandler::<AggregateAndProofBase<MainnetEthSpec>, MainnetEthSpec>::pre_electra()
.run();
SszStaticHandler::<AggregateAndProofElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only(
)
.run();
SszStaticHandler::<AggregateAndProofElectra<MainnetEthSpec>, MainnetEthSpec>::electra_only(
)
.run();
}
// BeaconBlockBody has no internal indicator of which fork it is for, so we test it separately. // BeaconBlockBody has no internal indicator of which fork it is for, so we test it separately.
#[test] #[test]
fn beacon_block_body() { fn beacon_block_body() {
@@ -283,22 +312,6 @@ mod ssz_static {
.run(); .run();
} }
#[test]
fn signed_aggregate_and_proof() {
SszStaticHandler::<SignedAggregateAndProofBase<MinimalEthSpec>, MinimalEthSpec>::pre_electra(
)
.run();
SszStaticHandler::<SignedAggregateAndProofBase<MainnetEthSpec>, MainnetEthSpec>::pre_electra(
)
.run();
SszStaticHandler::<SignedAggregateAndProofElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only(
)
.run();
SszStaticHandler::<SignedAggregateAndProofElectra<MainnetEthSpec>, MainnetEthSpec>::electra_only(
)
.run();
}
// Altair and later // Altair and later
#[test] #[test]
fn contribution_and_proof() { fn contribution_and_proof() {