diff --git a/client/consensus/aura/src/collators/lookahead.rs b/client/consensus/aura/src/collators/lookahead.rs index 4b06fb7d9f7..1ec21fb0a84 100644 --- a/client/consensus/aura/src/collators/lookahead.rs +++ b/client/consensus/aura/src/collators/lookahead.rs @@ -37,10 +37,10 @@ use cumulus_client_consensus_common::{ self as consensus_common, ParachainBlockImportMarker, ParentSearchParams, }; use cumulus_client_consensus_proposer::ProposerInterface; +use cumulus_primitives_aura::AuraUnincludedSegmentApi; use cumulus_primitives_core::{ relay_chain::Hash as PHash, CollectCollationInfo, PersistedValidationData, }; -use cumulus_primitives_aura::AuraUnincludedSegmentApi; use cumulus_relay_chain_interface::RelayChainInterface; use polkadot_overseer::Handle as OverseerHandle; @@ -96,7 +96,8 @@ pub async fn run + Send + Sync + 'static, - Client::Api: AuraApi + CollectCollationInfo + AuraUnincludedSegmentApi, + Client::Api: + AuraApi + CollectCollationInfo + AuraUnincludedSegmentApi, Backend: sp_blockchain::Backend, RClient: RelayChainInterface, CIDP: CreateInherentDataProviders + 'static, diff --git a/client/consensus/aura/src/equivocation_import_queue.rs b/client/consensus/aura/src/equivocation_import_queue.rs index 8b38221d03c..ac9c2a52829 100644 --- a/client/consensus/aura/src/equivocation_import_queue.rs +++ b/client/consensus/aura/src/equivocation_import_queue.rs @@ -19,10 +19,9 @@ /// Equivocation resistance in general is a hard problem, as different nodes in the network /// may see equivocations in a different order, and therefore may not agree on which blocks /// should be thrown out and which ones should be kept. - use codec::{Decode, Encode}; -use lru::LruCache; use cumulus_client_consensus_common::ParachainBlockImportMarker; +use lru::LruCache; use sc_consensus::{ import_queue::{BasicQueue, Verifier as VerifierT}, @@ -136,7 +135,7 @@ where return Err(format!( "Rejecting block {:?} due to excessive equivocations at slot", post_hash, - )); + )) } }, Err(aura_internal::SealVerificationError::Deferred(hdr, slot)) => { diff --git a/client/network/src/tests.rs b/client/network/src/tests.rs index 18fa7511eb3..d9254634dd4 100644 --- a/client/network/src/tests.rs +++ b/client/network/src/tests.rs @@ -243,8 +243,10 @@ impl RelayChainInterface for DummyRelayChainInterface { } } -fn make_validator_and_api( -) -> (RequireSecondedInBlockAnnounce>, Arc) { +fn make_validator_and_api() -> ( + RequireSecondedInBlockAnnounce>, + Arc, +) { let relay_chain_interface = Arc::new(DummyRelayChainInterface::new()); ( RequireSecondedInBlockAnnounce::new(relay_chain_interface.clone(), ParaId::from(56)), diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs index f3328343a3e..117e203d1ab 100644 --- a/client/service/src/lib.rs +++ b/client/service/src/lib.rs @@ -361,7 +361,8 @@ where _ => None, }; - let block_announce_validator = RequireSecondedInBlockAnnounce::new(relay_chain_interface, para_id); + let block_announce_validator = + RequireSecondedInBlockAnnounce::new(relay_chain_interface, para_id); let block_announce_validator_builder = move |_| Box::new(block_announce_validator) as Box<_>; sc_service::build_network(sc_service::BuildNetworkParams {