mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-31 05:07:12 +00:00
merge conflicts
This commit is contained in:
@@ -45,6 +45,7 @@ pub mod observed_block_producers;
|
||||
pub mod observed_data_sidecars;
|
||||
pub mod observed_operations;
|
||||
mod observed_slashable;
|
||||
pub mod payload_envelope_streamer;
|
||||
pub mod payload_envelope_verification;
|
||||
pub mod pending_payload_envelopes;
|
||||
pub mod persisted_beacon_chain;
|
||||
@@ -76,7 +77,7 @@ pub use self::errors::{BeaconChainError, BlockProductionError};
|
||||
pub use self::historical_blocks::HistoricalBlockError;
|
||||
pub use attestation_verification::Error as AttestationError;
|
||||
pub use beacon_fork_choice_store::{
|
||||
BeaconForkChoiceStore, Error as ForkChoiceStoreError, PersistedForkChoiceStoreV17,
|
||||
BeaconForkChoiceStore, Error as ForkChoiceStoreError, PersistedForkChoiceStore,
|
||||
PersistedForkChoiceStoreV28,
|
||||
};
|
||||
pub use block_verification::{
|
||||
|
||||
Reference in New Issue
Block a user