gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 09:16:00 +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-08 12:53:14 -04:00
parent 7c0a8f840e 43c3f63e30
commit 721e73fd82
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
consensus/types/src/attestation.rs
View File

@@ -437,7 +437,7 @@ mod tests {
assert_eq!(signature, 288 + 16); assert_eq!(signature, 288 + 16);
let attestation_expected = aggregation_bits + attestation_data + signature; let attestation_expected = aggregation_bits + attestation_data + signature;
// TODO(electra) since we've removed attestation aggregation for electra variant // TODO(electra) since we've removed attestation aggregation for electra variant
// i've updated the attestation value expected from 488 544 // i've updated the attestation value expected from 488 544
// assert_eq!(attestation_expected, 488); // assert_eq!(attestation_expected, 488);
assert_eq!(attestation_expected, 488); assert_eq!(attestation_expected, 488);

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

@@ -112,7 +112,10 @@ 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, "SignedAggregateAndProofBase");
type_name_generic!(SignedAggregateAndProofElectra, "SignedAggregateAndProofElectra"); type_name_generic!(
SignedAggregateAndProofElectra,
"SignedAggregateAndProofElectra"
);
type_name_generic!(SignedBeaconBlock); type_name_generic!(SignedBeaconBlock);
type_name!(SignedBeaconBlockHeader); type_name!(SignedBeaconBlockHeader);
type_name_generic!(SignedContributionAndProof); type_name_generic!(SignedContributionAndProof);

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

@@ -248,21 +248,16 @@ mod ssz_static {
ssz_static_test!(validator, Validator); ssz_static_test!(validator, Validator);
ssz_static_test!(voluntary_exit, VoluntaryExit); ssz_static_test!(voluntary_exit, VoluntaryExit);
#[test] #[test]
fn signed_aggregate_and_proof() { fn signed_aggregate_and_proof() {
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( .run();
) SszStaticHandler::<AttesterSlashingElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only()
.run(); .run();
SszStaticHandler::<AttesterSlashingElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only( SszStaticHandler::<AttesterSlashingElectra<MainnetEthSpec>, MainnetEthSpec>::electra_only()
) .run();
.run();
SszStaticHandler::<AttesterSlashingElectra<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.