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

fix merge conflict issues

Browse Source
This commit is contained in:
realbigsean
2023-07-14 16:01:57 -04:00
parent a6f48f5ecb
commit 42f54ee561
18 changed files with 304 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_node/network/src/service/tests.rs
View File

@@ -3,7 +3,6 @@
mod tests {
use crate::persisted_dht::load_dht;
use crate::{NetworkConfig, NetworkService};
use beacon_chain::test_utils::BeaconChainHarness;
use beacon_processor::{
BeaconProcessorSend, MAX_SCHEDULED_WORK_QUEUE_LEN, MAX_WORK_EVENT_QUEUE_LEN,
};
@@ -13,8 +12,7 @@ mod tests {
use std::str::FromStr;
use std::sync::Arc;
use tokio::{runtime::Runtime, sync::mpsc};
use types::MinimalEthSpec;
use tokio::runtime::Runtime;
use beacon_chain::test_utils::EphemeralHarnessType;
use types::MinimalEthSpec as E;
type BeaconChainHarness = beacon_chain::test_utils::BeaconChainHarness<EphemeralHarnessType<E>>;