gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 01:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
realbigsean
2023-06-07 14:46:57 -04:00
parent c9727aeb2b
commit 185aecbf9e
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/network/src/beacon_processor/worker/sync_methods.rs
View File

@@ -22,7 +22,7 @@ use slot_clock::SlotClock;
use std::time::{SystemTime, UNIX_EPOCH}; use std::time::{SystemTime, UNIX_EPOCH};
use tokio::sync::mpsc; use tokio::sync::mpsc;
use types::blob_sidecar::FixedBlobSidecarList; use types::blob_sidecar::FixedBlobSidecarList;
use types::{Epoch, Hash256, SignedBeaconBlock}; use types::{Epoch, Hash256};
/// Id associated to a batch processing request, either a sync batch or a parent lookup. /// Id associated to a batch processing request, either a sync batch or a parent lookup.
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]

3
beacon_node/network/src/subnet_service/attestation_subnets.rs
View File

@@ -3,7 +3,6 @@
//! determines whether attestations should be aggregated and/or passed to the beacon node. //! determines whether attestations should be aggregated and/or passed to the beacon node.
use super::SubnetServiceMessage; use super::SubnetServiceMessage;
#[cfg(all(test, feature = "spec-mainnet"))]
use std::collections::HashSet; use std::collections::HashSet;
use std::collections::{HashMap, VecDeque}; use std::collections::{HashMap, VecDeque};
use std::pin::Pin; use std::pin::Pin;
@@ -180,7 +179,7 @@ impl<T: BeaconChainTypes> AttestationService<T> {
} }
} }
#[cfg(test)] #[cfg(all(test, feature = "spec-mainnet"))]
pub(crate) fn long_lived_subscriptions(&self) -> &HashSet<SubnetId> { pub(crate) fn long_lived_subscriptions(&self) -> &HashSet<SubnetId> {
&self.long_lived_subscriptions &self.long_lived_subscriptions
} }