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

get ef tests passing after capella rebase

Browse Source
This commit is contained in:
realbigsean
2023-01-11 18:32:15 -05:00
parent 438126f19a
commit f7f351784a
9 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
testing/ef_tests/src/cases/operations.rs
View File

@@ -344,10 +344,6 @@ impl<E: EthSpec> Operation<E> for WithdrawalsPayload<E> {
}
fn is_enabled_for_fork(fork_name: ForkName) -> bool {
if fork_name == ForkName::Capella && !cfg!(feature = "withdrawals-processing") {
return false;
}
fork_name != ForkName::Base && fork_name != ForkName::Altair && fork_name != ForkName::Merge
}
@@ -366,12 +362,7 @@ impl<E: EthSpec> Operation<E> for WithdrawalsPayload<E> {
spec: &ChainSpec,
_: &Operations<E, Self>,
) -> Result<(), BlockProcessingError> {
//FIXME(sean) remove this once the spec tests sort this out
if matches!(state, BeaconState::Eip4844(_)) {
Ok(())
} else {
process_withdrawals::<_, FullPayload<_>>(state, self.payload.to_ref(), spec)
}
process_withdrawals::<_, FullPayload<_>>(state, self.payload.to_ref(), spec)
}
}
@@ -385,9 +376,6 @@ impl<E: EthSpec> Operation<E> for SignedBlsToExecutionChange {
}
fn is_enabled_for_fork(fork_name: ForkName) -> bool {
if fork_name == ForkName::Capella && !cfg!(feature = "withdrawals-processing") {
return false;
}
fork_name != ForkName::Base && fork_name != ForkName::Altair && fork_name != ForkName::Merge
}
@@ -401,12 +389,7 @@ impl<E: EthSpec> Operation<E> for SignedBlsToExecutionChange {
spec: &ChainSpec,
_extra: &Operations<E, Self>,
) -> Result<(), BlockProcessingError> {
//FIXME(sean) remove this once the spec tests sort this out
if matches!(state, BeaconState::Eip4844(_)) {
Ok(())
} else {
process_bls_to_execution_changes(state, &[self.clone()], VerifySignatures::True, spec)
}
process_bls_to_execution_changes(state, &[self.clone()], VerifySignatures::True, spec)
}
}

8
testing/ef_tests/src/cases/sanity_blocks.rs
View File

@@ -60,14 +60,6 @@ impl<E: EthSpec> Case for SanityBlocks<E> {
}
fn result(&self, _case_index: usize, fork_name: ForkName) -> Result<(), Error> {
if cfg!(feature = "withdrawals-processing") && fork_name == ForkName::Eip4844 {
return Ok(());
}
if !cfg!(feature = "withdrawals-processing") && fork_name == ForkName::Capella {
return Ok(());
}
self.metadata.bls_setting.unwrap_or_default().check()?;
let mut bulk_state = self.pre.clone();