From 2d2fd30b7a2bb912310602b07566c0986ba341ef Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Thu, 31 Mar 2022 11:40:15 +0000 Subject: [PATCH] cargo fmt --- --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -405,9 +405,8 @@ if is_dev_service { info!("Running Dev service"); - let autoseal_interval = AutosealInterval::new( - Duration::from_millis(cli.idle_autoseal_interval) - )?; + let autoseal_interval = + AutosealInterval::new(Duration::from_millis(cli.idle_autoseal_interval))?; return start_node_using_chain_runtime! { start_dev_node(config, autoseal_interval).map_err(Into::into) --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -24,7 +24,11 @@ use std::pin::Pin; use fc_rpc_core::types::FeeHistoryCache; use futures::Future; -use futures::{Stream, StreamExt, stream::select, task::{Context, Poll}}; +use futures::{ + Stream, StreamExt, + stream::select, + task::{Context, Poll}, +}; use futures_timer::Delay; use unique_rpc::overrides_handle; @@ -116,7 +120,7 @@ pub struct AutosealInterval { duration: Duration, - delay_handle: Pin> + delay_handle: Pin>, } impl AutosealInterval { @@ -127,7 +131,7 @@ Ok(Self { duration, - delay_handle: Box::pin(Delay::new(duration)) + delay_handle: Box::pin(Delay::new(duration)), }) } } @@ -143,7 +147,7 @@ Poll::Ready(Some(())) } - Poll::Pending => Poll::Pending + Poll::Pending => Poll::Pending, } } } @@ -836,35 +840,32 @@ telemetry.as_ref().map(|x| x.handle()), ); - let transactions_commands_stream: Box> + Send + Sync + Unpin> = - Box::new( - transaction_pool - .pool() - .validated_pool() - .import_notification_stream() - .map(|_| EngineCommand::SealNewBlock { - create_empty: true, - finalize: false, - parent_hash: None, - sender: None, - }), - ); - - let autoseal_interval = Box::pin(autoseal_interval); - let idle_commands_stream: Box> + Send + Sync + Unpin> = - Box::new( - autoseal_interval.map(|_| EngineCommand::SealNewBlock { + let transactions_commands_stream: Box< + dyn Stream> + Send + Sync + Unpin, + > = Box::new( + transaction_pool + .pool() + .validated_pool() + .import_notification_stream() + .map(|_| EngineCommand::SealNewBlock { create_empty: true, finalize: false, parent_hash: None, sender: None, - }) - ); + }), + ); + + let autoseal_interval = Box::pin(autoseal_interval); + let idle_commands_stream: Box< + dyn Stream> + Send + Sync + Unpin, + > = Box::new(autoseal_interval.map(|_| EngineCommand::SealNewBlock { + create_empty: true, + finalize: false, + parent_hash: None, + sender: None, + })); - let commands_stream = select( - transactions_commands_stream, - idle_commands_stream - ); + let commands_stream = select(transactions_commands_stream, idle_commands_stream); let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; let client_set_aside_for_cidp = client.clone(); -- gitstuff