From 4a5ec22a3b65629d988bdbeec68e083c67001526 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Wed, 19 Jul 2023 16:45:56 -0500 Subject: [PATCH] fmt --- client/consensus/aura/src/collators/basic.rs | 13 +++---- polkadot-parachain/src/service.rs | 38 +++++++++++++------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/client/consensus/aura/src/collators/basic.rs b/client/consensus/aura/src/collators/basic.rs index 2b45955abd9c..32c2b2258905 100644 --- a/client/consensus/aura/src/collators/basic.rs +++ b/client/consensus/aura/src/collators/basic.rs @@ -161,16 +161,17 @@ where continue } - match params.relay_client.candidate_pending_availability( - *request.relay_parent(), - params.para_id, - ).await { + match params + .relay_client + .candidate_pending_availability(*request.relay_parent(), params.para_id) + .await + { Err(e) => reject_with_error!(e), Ok(Some(_)) => { tracing::info!(target: crate::LOG_TARGET, "Basic mode - don't author when pending availability"); continue - } - Ok(None) => {} + }, + Ok(None) => {}, } let relay_parent_header = diff --git a/polkadot-parachain/src/service.rs b/polkadot-parachain/src/service.rs index be256770e77e..b1a542734e84 100644 --- a/polkadot-parachain/src/service.rs +++ b/polkadot-parachain/src/service.rs @@ -17,7 +17,9 @@ use codec::Codec; use cumulus_client_cli::CollatorOptions; use cumulus_client_collator::service::CollatorService; -use cumulus_client_consensus_aura::collators::basic::{self as basic_aura, Params as BasicAuraParams}; +use cumulus_client_consensus_aura::collators::basic::{ + self as basic_aura, Params as BasicAuraParams, +}; use cumulus_client_consensus_common::{ ParachainBlockImport as TParachainBlockImport, ParachainCandidate, ParachainConsensus, }; @@ -826,10 +828,17 @@ pub async fn start_rococo_parachain_node( authoring_duration: Duration::from_millis(500), }; - let fut = - basic_aura::run::( - params, - ); + let fut = basic_aura::run::< + Block, + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + _, + _, + _, + >(params); task_manager.spawn_essential_handle().spawn("aura", None, fut); Ok(()) @@ -1224,9 +1233,7 @@ where }; let fut = - basic_aura::run::::Pair, _, _, _, _, _, _, _>( - params, - ); + basic_aura::run::::Pair, _, _, _, _, _, _, _>(params); task_manager.spawn_essential_handle().spawn("aura", None, fut); Ok(()) @@ -1539,10 +1546,17 @@ pub async fn start_contracts_rococo_node( authoring_duration: Duration::from_millis(500), }; - let fut = - basic_aura::run::( - params, - ); + let fut = basic_aura::run::< + Block, + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + _, + _, + _, + >(params); task_manager.spawn_essential_handle().spawn("aura", None, fut); Ok(())