Run cargo fmt on the whole code base (#9394)

* Run cargo fmt on the whole code base

* Second run

* Add CI check

* Fix compilation

* More unnecessary braces

* Handle weights

* Use --all

* Use correct attributes...

* Fix UI tests

* AHHHHHHHHH

* 🤦

* Docs

* Fix compilation

* 🤷

* Please stop

* 🤦 x 2

* More

* make rustfmt.toml consistent with polkadot

Co-authored-by: André Silva <andrerfosilva@gmail.com>

substrate/client/service/test/src/lib.rs

@@ -18,38 +18,27 @@
 
 //! Service integration test utils.
 
-use std::iter;
-use std::sync::Arc;
-use std::net::Ipv4Addr;
-use std::pin::Pin;
-use std::time::Duration;
-use log::{info, debug};
-use futures01::{Future, Stream, Poll};
 use futures::{FutureExt as _, TryFutureExt as _};
-use tempfile::TempDir;
-use tokio::{runtime::Runtime, prelude::FutureExt};
-use tokio::timer::Interval;
-use sc_service::{
-	TaskManager,
-	SpawnTaskHandle,
-	GenericChainSpec,
-	ChainSpecExtension,
-	Configuration,
-	KeepBlocks, TransactionStorageMode,
-	config::{BasePath, DatabaseConfig, KeystoreConfig},
-	RuntimeGenesis,
-	Role,
-	Error,
-	TaskExecutor,
-	client::Client,
-};
-use sp_blockchain::HeaderBackend;
-use sc_network::{multiaddr, Multiaddr};
-use sc_network::config::{NetworkConfiguration, TransportConfig};
-use sp_runtime::{generic::BlockId, traits::Block as BlockT};
-use sc_transaction_pool_api::TransactionPool;
-use sc_client_api::{Backend, CallExecutor};
+use futures01::{Future, Poll, Stream};
+use log::{debug, info};
 use parking_lot::Mutex;
+use sc_client_api::{Backend, CallExecutor};
+use sc_network::{
+	config::{NetworkConfiguration, TransportConfig},
+	multiaddr, Multiaddr,
+};
+use sc_service::{
+	client::Client,
+	config::{BasePath, DatabaseConfig, KeystoreConfig},
+	ChainSpecExtension, Configuration, Error, GenericChainSpec, KeepBlocks, Role, RuntimeGenesis,
+	SpawnTaskHandle, TaskExecutor, TaskManager, TransactionStorageMode,
+};
+use sc_transaction_pool_api::TransactionPool;
+use sp_blockchain::HeaderBackend;
+use sp_runtime::{generic::BlockId, traits::Block as BlockT};
+use std::{iter, net::Ipv4Addr, pin::Pin, sync::Arc, time::Duration};
+use tempfile::TempDir;
+use tokio::{prelude::FutureExt, runtime::Runtime, timer::Interval};
 
 #[cfg(test)]
 mod client;
@@ -67,7 +56,9 @@ struct TestNet<G, E, F, L, U> {
 	nodes: usize,
 }
 
-pub trait TestNetNode: Clone + Future<Item = (), Error = sc_service::Error> + Send + 'static {
+pub trait TestNetNode:
+	Clone + Future<Item = (), Error = sc_service::Error> + Send + 'static
+{
 	type Block: BlockT;
 	type Backend: Backend<Self::Block>;
 	type Executor: CallExecutor<Self::Block> + Send + Sync;
@@ -76,7 +67,9 @@ pub trait TestNetNode: Clone + Future<Item = (), Error = sc_service::Error> + Se
 
 	fn client(&self) -> Arc<Client<Self::Backend, Self::Executor, Self::Block, Self::RuntimeApi>>;
 	fn transaction_pool(&self) -> Arc<Self::TransactionPool>;
-	fn network(&self) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>>;
+	fn network(
+		&self,
+	) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>>;
 	fn spawn_handle(&self) -> SpawnTaskHandle;
 }
 
@@ -88,23 +81,21 @@ pub struct TestNetComponents<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> {
 }
 
 impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool>
-TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool> {
+	TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
+{
 	pub fn new(
 		task_manager: TaskManager,
 		client: Arc<Client<TBackend, TExec, TBl, TRtApi>>,
 		network: Arc<sc_network::NetworkService<TBl, <TBl as BlockT>::Hash>>,
 		transaction_pool: Arc<TExPool>,
 	) -> Self {
-		Self {
-			client, transaction_pool, network,
-			task_manager: Arc::new(Mutex::new(task_manager)),
-		}
+		Self { client, transaction_pool, network, task_manager: Arc::new(Mutex::new(task_manager)) }
 	}
 }
 
-
-impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Clone for
-TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool> {
+impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Clone
+	for TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
+{
 	fn clone(&self) -> Self {
 		Self {
 			task_manager: self.task_manager.clone(),
@@ -115,8 +106,8 @@ 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;
@@ -126,14 +117,14 @@ impl<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> Future for
 	}
 }
 
-impl<TBl, TBackend, TExec, TRtApi, TExPool> TestNetNode for
-TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
-	where
-		TBl: BlockT,
-		TBackend: sc_client_api::Backend<TBl> + Send + Sync + 'static,
-		TExec: CallExecutor<TBl> + Send + Sync + 'static,
-		TRtApi: Send + Sync + 'static,
-		TExPool: TransactionPool<Block = TBl> + Send + Sync + 'static,
+impl<TBl, TBackend, TExec, TRtApi, TExPool> TestNetNode
+	for TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
+where
+	TBl: BlockT,
+	TBackend: sc_client_api::Backend<TBl> + Send + Sync + 'static,
+	TExec: CallExecutor<TBl> + Send + Sync + 'static,
+	TRtApi: Send + Sync + 'static,
+	TExPool: TransactionPool<Block = TBl> + Send + Sync + 'static,
 {
 	type Block = TBl;
 	type Backend = TBackend;
@@ -147,7 +138,9 @@ TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
 	fn transaction_pool(&self) -> Arc<Self::TransactionPool> {
 		self.transaction_pool.clone()
 	}
-	fn network(&self) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>> {
+	fn network(
+		&self,
+	) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>> {
 		self.network.clone()
 	}
 	fn spawn_handle(&self) -> SpawnTaskHandle {
@@ -156,33 +149,32 @@ TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
 }
 
 impl<G, E, F, L, U> TestNet<G, E, F, L, U>
-where F: Clone + Send + 'static, L: Clone + Send +'static, U: Clone + Send + 'static
+where
+	F: Clone + Send + 'static,
+	L: Clone + Send + 'static,
+	U: Clone + Send + 'static,
 {
-	pub fn run_until_all_full<FP, LP>(
-		&mut self,
-		full_predicate: FP,
-		light_predicate: LP,
-	)
-		where
-			FP: Send + Fn(usize, &F) -> bool + 'static,
-			LP: Send + Fn(usize, &L) -> bool + 'static,
+	pub fn run_until_all_full<FP, LP>(&mut self, full_predicate: FP, light_predicate: LP)
+	where
+		FP: Send + Fn(usize, &F) -> bool + 'static,
+		LP: Send + Fn(usize, &L) -> bool + 'static,
 	{
 		let full_nodes = self.full_nodes.clone();
 		let light_nodes = self.light_nodes.clone();
 		let interval = Interval::new_interval(Duration::from_millis(100))
 			.map_err(|_| ())
 			.for_each(move |_| {
-				let full_ready = full_nodes.iter().all(|&(ref id, ref service, _, _)|
-					full_predicate(*id, service)
-				);
+				let full_ready = full_nodes
+					.iter()
+					.all(|&(ref id, ref service, _, _)| full_predicate(*id, service));
 
 				if !full_ready {
-					return Ok(());
+					return Ok(())
 				}
 
-				let light_ready = light_nodes.iter().all(|&(ref id, ref service, _)|
-					light_predicate(*id, service)
-				);
+				let light_ready = light_nodes
+					.iter()
+					.all(|&(ref id, ref service, _)| light_predicate(*id, service));
 
 				if !light_ready {
 					Ok(())
@@ -200,7 +192,10 @@ where F: Clone + Send + 'static, L: Clone + Send +'static, U: Clone + Send + 'st
 	}
 }
 
-fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'static + Send + Sync> (
+fn node_config<
+	G: RuntimeGenesis + 'static,
+	E: ChainSpecExtension + Clone + 'static + Send + Sync,
+>(
 	index: usize,
 	spec: &GenericChainSpec<G, E>,
 	role: Role,
@@ -208,8 +203,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 	key_seed: Option<String>,
 	base_port: u16,
 	root: &TempDir,
-) -> Configuration
-{
+) -> Configuration {
 	let root = root.path().join(format!("node-{}", index));
 
 	let mut network_config = NetworkConfiguration::new(
@@ -224,7 +218,7 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 	network_config.listen_addresses.push(
 		iter::once(multiaddr::Protocol::Ip4(Ipv4Addr::new(127, 0, 0, 1)))
 			.chain(iter::once(multiaddr::Protocol::Tcp(base_port + index as u16)))
-			.collect()
+			.collect(),
 	);
 
 	network_config.transport = TransportConfig::Normal {
@@ -241,14 +235,8 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 		transaction_pool: Default::default(),
 		network: network_config,
 		keystore_remote: Default::default(),
-		keystore: KeystoreConfig::Path {
-			path: root.join("key"),
-			password: None
-		},
-		database: DatabaseConfig::RocksDb {
-			path: root.join("db"),
-			cache_size: 128,
-		},
+		keystore: KeystoreConfig::Path { path: root.join("key"), password: None },
+		database: DatabaseConfig::RocksDb { path: root.join("db"), cache_size: 128 },
 		state_cache_size: 16777216,
 		state_cache_child_ratio: None,
 		state_pruning: Default::default(),
@@ -284,7 +272,8 @@ fn node_config<G: RuntimeGenesis + 'static, E: ChainSpecExtension + Clone + 'sta
 	}
 }
 
-impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
+impl<G, E, F, L, U> TestNet<G, E, F, L, U>
+where
 	F: TestNetNode,
 	L: TestNetNode,
 	E: ChainSpecExtension + Clone + 'static + Send + Sync,
@@ -295,11 +284,8 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 		spec: GenericChainSpec<G, E>,
 		full: impl Iterator<Item = impl FnOnce(Configuration) -> Result<(F, U), Error>>,
 		light: impl Iterator<Item = impl FnOnce(Configuration) -> Result<L, Error>>,
-		authorities: impl Iterator<Item = (
-			String,
-			impl FnOnce(Configuration) -> Result<(F, U), Error>
-		)>,
-		base_port: u16
+		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration) -> Result<(F, U), Error>)>,
+		base_port: u16,
 	) -> TestNet<G, E, F, L, U> {
 		sp_tracing::try_init_simple();
 		fdlimit::raise_fd_limit();
@@ -322,7 +308,7 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 		temp: &TempDir,
 		full: impl Iterator<Item = impl FnOnce(Configuration) -> Result<(F, U), Error>>,
 		light: impl Iterator<Item = impl FnOnce(Configuration) -> Result<L, Error>>,
-		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration) -> Result<(F, U), Error>)>
+		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration) -> Result<(F, U), Error>)>,
 	) {
 		let executor = self.runtime.executor();
 		let task_executor: TaskExecutor = {
@@ -330,7 +316,8 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 			(move |fut: Pin<Box<dyn futures::Future<Output = ()> + Send>>, _| {
 				executor.spawn(fut.unit_error().compat());
 				async {}
-			}).into()
+			})
+			.into()
 		};
 
 		for (key, authority) in authorities {
@@ -344,10 +331,12 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 				&temp,
 			);
 			let addr = node_config.network.listen_addresses.iter().next().unwrap().clone();
-			let (service, user_data) = authority(node_config).expect("Error creating test node service");
+			let (service, user_data) =
+				authority(node_config).expect("Error creating test node service");
 
 			executor.spawn(service.clone().map_err(|_| ()));
-			let addr = addr.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
+			let addr = addr
+				.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
 			self.authority_nodes.push((self.nodes, service, user_data, addr));
 			self.nodes += 1;
 		}
@@ -366,7 +355,8 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 			let (service, user_data) = full(node_config).expect("Error creating test node service");
 
 			executor.spawn(service.clone().map_err(|_| ()));
-			let addr = addr.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
+			let addr = addr
+				.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
 			self.full_nodes.push((self.nodes, service, user_data, addr));
 			self.nodes += 1;
 		}
@@ -385,7 +375,8 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 			let service = light(node_config).expect("Error creating test node service");
 
 			executor.spawn(service.clone().map_err(|_| ()));
-			let addr = addr.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
+			let addr = addr
+				.with(multiaddr::Protocol::P2p(service.network().local_peer_id().clone().into()));
 			self.light_nodes.push((self.nodes, service, addr));
 			self.nodes += 1;
 		}
@@ -393,7 +384,10 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 }
 
 fn tempdir_with_prefix(prefix: &str) -> TempDir {
-	tempfile::Builder::new().prefix(prefix).tempdir().expect("Error creating test dir")
+	tempfile::Builder::new()
+		.prefix(prefix)
+		.tempdir()
+		.expect("Error creating test dir")
 }
 
 pub fn connectivity<G, E, Fb, F, Lb, L>(
@@ -420,8 +414,8 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 			let mut network = TestNet::new(
 				&temp,
 				spec.clone(),
-				(0..NUM_FULL_NODES).map(|_| { |cfg| full_builder(cfg).map(|s| (s, ())) }),
-				(0..NUM_LIGHT_NODES).map(|_| { |cfg| light_builder(cfg) }),
+				(0..NUM_FULL_NODES).map(|_| |cfg| full_builder(cfg).map(|s| (s, ()))),
+				(0..NUM_LIGHT_NODES).map(|_| |cfg| light_builder(cfg)),
 				// Note: this iterator is empty but we can't just use `iter::empty()`, otherwise
 				// the type of the closure cannot be inferred.
 				(0..0).map(|_| (String::new(), { |cfg| full_builder(cfg).map(|s| (s, ())) })),
@@ -430,11 +424,15 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 			info!("Checking star topology");
 			let first_address = network.full_nodes[0].3.clone();
 			for (_, service, _, _) in network.full_nodes.iter().skip(1) {
-				service.network().add_reserved_peer(first_address.to_string())
+				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())
+				service
+					.network()
+					.add_reserved_peer(first_address.to_string())
 					.expect("Error adding reserved peer");
 			}
 
@@ -464,8 +462,8 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 			let mut network = TestNet::new(
 				&temp,
 				spec,
-				(0..NUM_FULL_NODES).map(|_| { |cfg| full_builder(cfg).map(|s| (s, ())) }),
-				(0..NUM_LIGHT_NODES).map(|_| { |cfg| light_builder(cfg) }),
+				(0..NUM_FULL_NODES).map(|_| |cfg| full_builder(cfg).map(|s| (s, ()))),
+				(0..NUM_LIGHT_NODES).map(|_| |cfg| light_builder(cfg)),
 				// Note: this iterator is empty but we can't just use `iter::empty()`, otherwise
 				// the type of the closure cannot be inferred.
 				(0..0).map(|_| (String::new(), { |cfg| full_builder(cfg).map(|s| (s, ())) })),
@@ -477,14 +475,18 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 			for i in 0..max_nodes {
 				if i != 0 {
 					if let Some((_, service, _, node_id)) = network.full_nodes.get(i) {
-						service.network().add_reserved_peer(address.to_string())
+						service
+							.network()
+							.add_reserved_peer(address.to_string())
 							.expect("Error adding reserved peer");
 						address = node_id.clone();
 					}
 				}
 
 				if let Some((_, service, node_id)) = network.light_nodes.get(i) {
-					service.network().add_reserved_peer(address.to_string())
+					service
+						.network()
+						.add_reserved_peer(address.to_string())
 						.expect("Error adding reserved peer");
 					address = node_id.clone();
 				}
@@ -512,7 +514,7 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	full_builder: Fb,
 	light_builder: Lb,
 	mut make_block_and_import: B,
-	mut extrinsic_factory: ExF
+	mut extrinsic_factory: ExF,
 ) where
 	Fb: Fn(Configuration) -> Result<(F, U), Error>,
 	F: TestNetNode,
@@ -532,8 +534,8 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	let mut network = TestNet::new(
 		&temp,
 		spec,
-		(0..NUM_FULL_NODES).map(|_| { |cfg| full_builder(cfg) }),
-		(0..NUM_LIGHT_NODES).map(|_| { |cfg| light_builder(cfg) }),
+		(0..NUM_FULL_NODES).map(|_| |cfg| full_builder(cfg)),
+		(0..NUM_LIGHT_NODES).map(|_| |cfg| light_builder(cfg)),
 		// Note: this iterator is empty but we can't just use `iter::empty()`, otherwise
 		// the type of the closure cannot be inferred.
 		(0..0).map(|_| (String::new(), { |cfg| full_builder(cfg) })),
@@ -542,7 +544,7 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	info!("Checking block sync");
 	let first_address = {
 		let &mut (_, ref first_service, ref mut first_user_data, _) = &mut network.full_nodes[0];
-		for i in 0 .. NUM_BLOCKS {
+		for i in 0..NUM_BLOCKS {
 			if i % 128 == 0 {
 				info!("Generating #{}", i + 1);
 			}
@@ -550,24 +552,29 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 			make_block_and_import(&first_service, first_user_data);
 		}
 		let info = network.full_nodes[0].1.client().info();
-		network.full_nodes[0].1.network().new_best_block_imported(info.best_hash, info.best_number);
+		network.full_nodes[0]
+			.1
+			.network()
+			.new_best_block_imported(info.best_hash, info.best_number);
 		network.full_nodes[0].3.clone()
 	};
 
 	info!("Running sync");
 	for (_, service, _, _) in network.full_nodes.iter().skip(1) {
-		service.network().add_reserved_peer(first_address.to_string())
+		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())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	network.run_until_all_full(
-		|_index, service|
-			service.client().info().best_number == (NUM_BLOCKS as u32).into(),
-		|_index, service|
-			service.client().info().best_number == (NUM_BLOCKS as u32).into(),
+		|_index, service| service.client().info().best_number == (NUM_BLOCKS as u32).into(),
+		|_index, service| service.client().info().best_number == (NUM_BLOCKS as u32).into(),
 	);
 
 	info!("Checking extrinsic propagation");
@@ -577,9 +584,12 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	let extrinsic = extrinsic_factory(&first_service, first_user_data);
 	let source = sc_transaction_pool_api::TransactionSource::External;
 
-	futures::executor::block_on(
-		first_service.transaction_pool().submit_one(&best_block, source, extrinsic)
-	).expect("failed to submit extrinsic");
+	futures::executor::block_on(first_service.transaction_pool().submit_one(
+		&best_block,
+		source,
+		extrinsic,
+	))
+	.expect("failed to submit extrinsic");
 
 	network.run_until_all_full(
 		|_index, service| service.transaction_pool().ready().count() == 1,
@@ -591,7 +601,7 @@ pub fn consensus<G, E, Fb, F, Lb, L>(
 	spec: GenericChainSpec<G, E>,
 	full_builder: Fb,
 	light_builder: Lb,
-	authorities: impl IntoIterator<Item = String>
+	authorities: impl IntoIterator<Item = String>,
 ) where
 	Fb: Fn(Configuration) -> Result<F, Error>,
 	F: TestNetNode,
@@ -607,54 +617,64 @@ pub fn consensus<G, E, Fb, F, Lb, L>(
 	let mut network = TestNet::new(
 		&temp,
 		spec,
-		(0..NUM_FULL_NODES / 2).map(|_| { |cfg| full_builder(cfg).map(|s| (s, ())) }),
-		(0..NUM_LIGHT_NODES / 2).map(|_| { |cfg| light_builder(cfg) }),
-		authorities.into_iter().map(|key| (key, { |cfg| full_builder(cfg).map(|s| (s, ())) })),
+		(0..NUM_FULL_NODES / 2).map(|_| |cfg| full_builder(cfg).map(|s| (s, ()))),
+		(0..NUM_LIGHT_NODES / 2).map(|_| |cfg| light_builder(cfg)),
+		authorities
+			.into_iter()
+			.map(|key| (key, { |cfg| full_builder(cfg).map(|s| (s, ())) })),
 		30600,
 	);
 
 	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())
+		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())
+		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())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	network.run_until_all_full(
-		|_index, service|
-			service.client().info().finalized_number >= (NUM_BLOCKS as u32 / 2).into(),
-		|_index, service|
-			service.client().info().best_number >= (NUM_BLOCKS as u32 / 2).into(),
+		|_index, service| {
+			service.client().info().finalized_number >= (NUM_BLOCKS as u32 / 2).into()
+		},
+		|_index, service| service.client().info().best_number >= (NUM_BLOCKS as u32 / 2).into(),
 	);
 
 	info!("Adding more peers");
 	network.insert_nodes(
 		&temp,
-		(0..NUM_FULL_NODES / 2).map(|_| { |cfg| full_builder(cfg).map(|s| (s, ())) }),
-		(0..NUM_LIGHT_NODES / 2).map(|_| { |cfg| light_builder(cfg) }),
+		(0..NUM_FULL_NODES / 2).map(|_| |cfg| full_builder(cfg).map(|s| (s, ()))),
+		(0..NUM_LIGHT_NODES / 2).map(|_| |cfg| light_builder(cfg)),
 		// Note: this iterator is empty but we can't just use `iter::empty()`, otherwise
 		// the type of the closure cannot be inferred.
 		(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())
+		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())
+		service
+			.network()
+			.add_reserved_peer(first_address.to_string())
 			.expect("Error adding reserved peer");
 	}
 	network.run_until_all_full(
-		|_index, service|
-			service.client().info().finalized_number >= (NUM_BLOCKS as u32).into(),
-		|_index, service|
-			service.client().info().best_number >= (NUM_BLOCKS as u32).into(),
+		|_index, service| service.client().info().finalized_number >= (NUM_BLOCKS as u32).into(),
+		|_index, service| service.client().info().best_number >= (NUM_BLOCKS as u32).into(),
 	);
 }