Fix line widths

bin/node/cli/src/service.rs

@@ -29,7 +29,7 @@ use node_executor;
 use node_primitives::Block;
 use node_runtime::RuntimeApi;
 use sc_service::{
-	ServiceBuilder, config::Configuration, error::{Error as ServiceError},
+	ServiceBuilder, config::{Role, Configuration}, error::{Error as ServiceError},
 	RpcHandlers, ServiceComponents, TaskManager,
 };
 use sp_inherents::InherentDataProviders;
@@ -235,7 +235,7 @@ pub fn new_full_base(
 	}
 
 	// Spawn authority discovery module.
-	if matches!(role, sc_service::config::Role::Authority{..} | sc_service::config::Role::Sentry {..}) {
+	if matches!(role, Role::Authority{..} | Role::Sentry {..}) {
 		let (sentries, authority_discovery_role) = match role {
 			sc_service::config::Role::Authority { ref sentry_nodes } => (
 				sentry_nodes.clone(),
@@ -250,10 +250,11 @@ pub fn new_full_base(
 			_ => unreachable!("Due to outer matches! constraint; qed.")
 		};
 
-		let dht_event_stream = network.event_stream("authority-discovery").filter_map(|e| async move { match e {
-			Event::Dht(e) => Some(e),
-			_ => None,
-		}}).boxed();
+		let dht_event_stream = network.event_stream("authority-discovery")
+			.filter_map(|e| async move { match e {
+				Event::Dht(e) => Some(e),
+				_ => None,
+			}}).boxed();
 		let authority_discovery = sc_authority_discovery::AuthorityDiscovery::new(
 			client.clone(),
 			network.clone(),
@@ -334,7 +335,9 @@ type LightFetcher = sc_network::config::OnDemand<Block>;
 pub fn new_light_base(config: Configuration) -> Result<(
 	TaskManager, Arc<RpcHandlers>, Arc<LightClient>,
 	Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
-	Arc<sc_transaction_pool::BasicPool<sc_transaction_pool::LightChainApi<LightClient, LightFetcher, Block>, Block>>
+	Arc<sc_transaction_pool::BasicPool<
+		sc_transaction_pool::LightChainApi<LightClient, LightFetcher, Block>, Block
+	>>
 ), ServiceError> {
 	let inherent_data_providers = InherentDataProviders::new();
 
@@ -437,9 +440,7 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 #[cfg(test)]
 mod tests {
 	use std::{sync::Arc, borrow::Cow, any::Any};
-	use sc_consensus_babe::{
-		CompatibleDigestItem, BabeIntermediate, INTERMEDIATE_KEY
-	};
+	use sc_consensus_babe::{CompatibleDigestItem, BabeIntermediate, INTERMEDIATE_KEY};
 	use sc_consensus_epochs::descendent_query;
 	use sp_consensus::{
 		Environment, Proposer, BlockImportParams, BlockOrigin, ForkChoiceStrategy, BlockImport,
@@ -490,14 +491,19 @@ mod tests {
 			chain_spec,
 			|config| {
 				let mut setup_handles = None;
-				let (keep_alive, inherent_data_providers, client, network, transaction_pool) = new_full_base(config, |
-					block_import: &sc_consensus_babe::BabeBlockImport<Block, _, _>,
-					babe_link: &sc_consensus_babe::BabeLink<Block>,
-				| {
-					setup_handles = Some((block_import.clone(), babe_link.clone()));
-				})?;
+				let (keep_alive, inherent_data_providers, client, network, transaction_pool) =
+					new_full_base(config,
+						|
+							block_import: &sc_consensus_babe::BabeBlockImport<Block, _, _>,
+							babe_link: &sc_consensus_babe::BabeLink<Block>,
+						| {
+							setup_handles = Some((block_import.clone(), babe_link.clone()));
+						}
+					)?;
 
-				let node = sc_service_test::TestNetComponents::new(keep_alive, client, network, transaction_pool);
+				let node = sc_service_test::TestNetComponents::new(
+					keep_alive, client, network, transaction_pool
+				);
 				Ok((node, (inherent_data_providers, setup_handles.unwrap())))
 			},
 			|config| {

client/service/src/builder.rs

@@ -917,7 +917,9 @@ ServiceBuilder<
 		Ok(self)
 	}
 
-	fn build_common(self) -> Result<ServiceComponents<TBl, TBackend, TExec, TRtApi, TSc, TExPool>, Error>
+	fn build_common(self) -> Result<
+		ServiceComponents<TBl, TBackend, TExec, TRtApi, TSc, TExPool>, Error
+	>
 		where TExec: CallExecutor<TBl, Backend = TBackend>,
 	{
 		let ServiceBuilder {
@@ -1115,7 +1117,9 @@ ServiceBuilder<
 	}
 
 	/// Builds the light service.
-	pub fn build_light(self) -> Result<ServiceComponents<TBl, TBackend, TExec, TRtApi, TSc, TExPool>, Error>
+	pub fn build_light(self) -> Result<
+		ServiceComponents<TBl, TBackend, TExec, TRtApi, TSc, TExPool>, Error
+	>
 		where TExec: CallExecutor<TBl, Backend = TBackend>,
 	{
 		self.build_common()
@@ -1158,7 +1162,9 @@ ServiceBuilder<
 {
 
 	/// Builds the full service.
-	pub fn build_full(self) -> Result<ServiceComponents<TBl, TBackend, TExec, TRtApi, TSc, TExPool>, Error>
+	pub fn build_full(self) -> Result<
+		ServiceComponents<TBl, TBackend, TExec, TRtApi, TSc, TExPool>, Error
+	>
 		where TExec: CallExecutor<TBl, Backend = TBackend>,
 	{
 		// make transaction pool available for off-chain runtime calls.

client/service/test/src/lib.rs

@@ -112,7 +112,9 @@ TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool> {
 	}
 }
 
-impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Future for TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool> {
+impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Future for
+	TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
+{
 	type Item = ();
 	type Error = sc_service::Error;
 
@@ -540,10 +542,12 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 
 	info!("Running sync");
 	for (_, service, _, _) in network.full_nodes.iter().skip(1) {
-		service.network().add_reserved_peer(first_address.to_string()).expect("Error adding reserved peer");
+		service.network().add_reserved_peer(first_address.to_string())
+			.expect("Error adding reserved peer");
 	}
 	for (_, service, _) in network.light_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string()).expect("Error adding reserved peer");
+		service.network().add_reserved_peer(first_address.to_string())
+			.expect("Error adding reserved peer");
 	}
 	network.run_until_all_full(
 		|_index, service|
@@ -598,13 +602,16 @@ pub fn consensus<G, E, Fb, F, Lb, L>(
 	info!("Checking consensus");
 	let first_address = network.authority_nodes[0].3.clone();
 	for (_, service, _, _) in network.full_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string()).expect("Error adding reserved peer");
+		service.network().add_reserved_peer(first_address.to_string())
+			.expect("Error adding reserved peer");
 	}
 	for (_, service, _) in network.light_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string()).expect("Error adding reserved peer");
+		service.network().add_reserved_peer(first_address.to_string())
+			.expect("Error adding reserved peer");
 	}
 	for (_, service, _, _) in network.authority_nodes.iter().skip(1) {
-		service.network().add_reserved_peer(first_address.to_string()).expect("Error adding reserved peer");
+		service.network().add_reserved_peer(first_address.to_string())
+			.expect("Error adding reserved peer");
 	}
 	network.run_until_all_full(
 		|_index, service|
@@ -623,10 +630,12 @@ pub fn consensus<G, E, Fb, F, Lb, L>(
 		(0..0).map(|_| (String::new(), { |cfg| full_builder(cfg).map(|s| (s, ())) })),
 	);
 	for (_, service, _, _) in network.full_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string()).expect("Error adding reserved peer");
+		service.network().add_reserved_peer(first_address.to_string())
+			.expect("Error adding reserved peer");
 	}
 	for (_, service, _) in network.light_nodes.iter() {
-		service.network().add_reserved_peer(first_address.to_string()).expect("Error adding reserved peer");
+		service.network().add_reserved_peer(first_address.to_string())
+			.expect("Error adding reserved peer");
 	}
 	network.run_until_all_full(
 		|_index, service|