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

fix compilation errors from merge

Browse Source
This commit is contained in:
realbigsean
2022-12-23 10:27:01 -05:00
parent f45d117e73
commit 5db0a88d4f
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testing/ef_tests/Cargo.toml
View File

@@ -9,7 +9,6 @@ edition = "2021"
ef_tests = []
milagro = ["bls/milagro"]
fake_crypto = ["bls/fake_crypto"]
withdrawals = ["state_processing/withdrawals", "store/withdrawals", "beacon_chain/withdrawals", "types/withdrawals", "execution_layer/withdrawals"]
withdrawals-processing = ["state_processing/withdrawals-processing", "store/withdrawals-processing", "beacon_chain/withdrawals-processing", "execution_layer/withdrawals-processing"]
[dependencies]

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

@@ -5,9 +5,9 @@ use crate::decode::{ssz_decode_file, ssz_decode_file_with, ssz_decode_state, yam
use crate::testing_spec;
use serde_derive::Deserialize;
#[cfg(feature = "withdrawals-processing")]
use state_processing::per_block_processing::process_operations::{
process_bls_to_execution_changes, process_bls_to_execution_changes,
};
use state_processing::per_block_processing::process_operations::process_bls_to_execution_changes;
#[cfg(feature = "withdrawals-processing")]
use state_processing::per_block_processing::process_withdrawals;
use state_processing::{
per_block_processing::{
errors::BlockProcessingError,
@@ -356,10 +356,6 @@ impl<E: EthSpec> Operation<E> for WithdrawalsPayload<E> {
return false;
}
if !cfg!(feature = "withdrawals") {
return false;
}
fork_name != ForkName::Base && fork_name != ForkName::Altair && fork_name != ForkName::Merge
}
@@ -372,7 +368,7 @@ impl<E: EthSpec> Operation<E> for WithdrawalsPayload<E> {
})
}
#[cfg(feature = "withdrawals")]
#[cfg(feature = "withdrawals-processing")]
fn apply_to(
&self,
state: &mut BeaconState<E>,
@@ -386,6 +382,7 @@ impl<E: EthSpec> Operation<E> for WithdrawalsPayload<E> {
process_withdrawals::<_, FullPayload<_>>(state, self.payload.to_ref(), spec)
}
}
}
#[cfg(feature = "withdrawals-processing")]
impl<E: EthSpec> Operation<E> for SignedBlsToExecutionChange {