gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-06-29 19:04:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ForkName Ord in fork-choice tests

Browse Source
This commit is contained in:
dapplion
2024-06-17 17:58:38 +02:00
parent 795eff9bf4
commit 960f8c5c48
1 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
testing/ef_tests/src/cases/fork_choice.rs
View File

@@ -179,42 +179,34 @@ impl<E: EthSpec> LoadCase for ForkChoiceTest<E> {
valid, valid,
}) })
} }
Step::Attestation { attestation } => match fork_name { Step::Attestation { attestation } => {
ForkName::Base if fork_name >= ForkName::Electra {
| ForkName::Altair ssz_decode_file(&path.join(format!("{}.ssz_snappy", attestation))).map(
| ForkName::Bellatrix |attestation| Step::Attestation {
| ForkName::Capella attestation: Attestation::Electra(attestation),
| ForkName::Deneb => ssz_decode_file( },
&path.join(format!("{}.ssz_snappy", attestation)), )
) } else {
.map(|attestation| Step::Attestation { ssz_decode_file(&path.join(format!("{}.ssz_snappy", attestation))).map(
attestation: Attestation::Base(attestation), |attestation| Step::Attestation {
}), attestation: Attestation::Base(attestation),
ForkName::Electra => ssz_decode_file( },
&path.join(format!("{}.ssz_snappy", attestation)), )
) }
.map(|attestation| Step::Attestation { }
attestation: Attestation::Electra(attestation), Step::AttesterSlashing { attester_slashing } => {
}), if fork_name >= ForkName::Electra {
}, ssz_decode_file(&path.join(format!("{}.ssz_snappy", attester_slashing)))
Step::AttesterSlashing { attester_slashing } => match fork_name { .map(|attester_slashing| Step::AttesterSlashing {
ForkName::Base attester_slashing: AttesterSlashing::Electra(attester_slashing),
| ForkName::Altair })
| ForkName::Bellatrix } else {
| ForkName::Capella
| ForkName::Deneb => {
ssz_decode_file(&path.join(format!("{}.ssz_snappy", attester_slashing))) ssz_decode_file(&path.join(format!("{}.ssz_snappy", attester_slashing)))
.map(|attester_slashing| Step::AttesterSlashing { .map(|attester_slashing| Step::AttesterSlashing {
attester_slashing: AttesterSlashing::Base(attester_slashing), attester_slashing: AttesterSlashing::Base(attester_slashing),
}) })
} }
ForkName::Electra => { }
ssz_decode_file(&path.join(format!("{}.ssz_snappy", attester_slashing)))
.map(|attester_slashing| Step::AttesterSlashing {
attester_slashing: AttesterSlashing::Electra(attester_slashing),
})
}
},
Step::PowBlock { pow_block } => { Step::PowBlock { pow_block } => {
ssz_decode_file(&path.join(format!("{}.ssz_snappy", pow_block))) ssz_decode_file(&path.join(format!("{}.ssz_snappy", pow_block)))
.map(|pow_block| Step::PowBlock { pow_block }) .map(|pow_block| Step::PowBlock { pow_block })