diff --git a/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs b/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs index 0ba08571f..02482d619 100644 --- a/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs +++ b/beacon_node/network/src/sync/block_lookups/single_block_lookup.rs @@ -204,8 +204,10 @@ impl slog::Value for SingleBlockRequest { #[cfg(test)] mod tests { use super::*; - use types::test_utils::{SeedableRng, TestRandom, XorShiftRng}; - use types::{MinimalEthSpec as E, SignedBeaconBlock}; + use types::{ + test_utils::{SeedableRng, TestRandom, XorShiftRng}, + MinimalEthSpec as E, SignedBeaconBlock, + }; fn rand_block() -> SignedBeaconBlock { let mut rng = XorShiftRng::from_seed([42; 16]); diff --git a/beacon_node/network/src/sync/block_lookups/tests.rs b/beacon_node/network/src/sync/block_lookups/tests.rs index 004d0479a..f1b966220 100644 --- a/beacon_node/network/src/sync/block_lookups/tests.rs +++ b/beacon_node/network/src/sync/block_lookups/tests.rs @@ -13,8 +13,10 @@ use slog::{Drain, Level}; use slot_clock::SystemTimeSlotClock; use store::MemoryStore; use tokio::sync::mpsc; -use types::test_utils::{SeedableRng, TestRandom, XorShiftRng}; -use types::MinimalEthSpec as E; +use types::{ + test_utils::{SeedableRng, TestRandom, XorShiftRng}, + MinimalEthSpec as E, SignedBeaconBlock, +}; type T = Witness, E, MemoryStore, MemoryStore>; diff --git a/beacon_node/network/src/sync/range_sync/range.rs b/beacon_node/network/src/sync/range_sync/range.rs index e3fceef66..358218541 100644 --- a/beacon_node/network/src/sync/range_sync/range.rs +++ b/beacon_node/network/src/sync/range_sync/range.rs @@ -372,26 +372,23 @@ where #[cfg(test)] mod tests { - use crate::service::RequestId; - use crate::sync::range_sync::ByRangeRequestType; - use crate::NetworkMessage; - use super::*; - use crate::beacon_processor::WorkEvent as BeaconWorkEvent; - use beacon_chain::builder::Witness; - use beacon_chain::eth1_chain::CachingEth1Backend; - use beacon_chain::parking_lot::RwLock; - use beacon_chain::EngineState; - use lighthouse_network::rpc::BlocksByRangeRequest; - use lighthouse_network::Request; - use lighthouse_network::{rpc::StatusMessage, NetworkGlobals}; - use slog::{o, Drain}; - use tokio::sync::mpsc; + use crate::beacon_processor::WorkEvent as BeaconWorkEvent; + use crate::service::RequestId; + use crate::NetworkMessage; + use beacon_chain::{ + builder::Witness, eth1_chain::CachingEth1Backend, parking_lot::RwLock, EngineState, + }; + use lighthouse_network::{ + rpc::{BlocksByRangeRequest, StatusMessage}, + NetworkGlobals, Request, + }; + use slog::{o, Drain}; use slot_clock::SystemTimeSlotClock; - use std::collections::HashSet; - use std::sync::Arc; + use std::{collections::HashSet, sync::Arc}; use store::MemoryStore; + use tokio::sync::mpsc; use types::{Hash256, MinimalEthSpec as E}; #[derive(Debug)]