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>
2026-06-09 20:11:09 +00:00 · 2021-07-21 16:32:32 +02:00
parent d451c38c1c
commit 7b56ab15b4
1010 changed files with 53339 additions and 51208 deletions
@@ -21,19 +21,24 @@
 use crate::protocol::notifications::{Notifications, NotificationsOut, ProtocolConfig};

 use futures::prelude::*;
-use libp2p::{PeerId, Multiaddr, Transport};
-use libp2p::core::{
-	connection::{ConnectionId, ListenerId},
-	ConnectedPoint,
-	transport::MemoryTransport,
-	upgrade
+use libp2p::{
+	core::{
+		connection::{ConnectionId, ListenerId},
+		transport::MemoryTransport,
+		upgrade, ConnectedPoint,
+	},
+	identity, noise,
+	swarm::{
+		IntoProtocolsHandler, NetworkBehaviour, NetworkBehaviourAction, PollParameters,
+		ProtocolsHandler, Swarm,
+	},
+	yamux, Multiaddr, PeerId, Transport,
 };
-use libp2p::{identity, noise, yamux};
-use libp2p::swarm::{
-	Swarm, ProtocolsHandler, IntoProtocolsHandler, PollParameters,
-	NetworkBehaviour, NetworkBehaviourAction
+use std::{
+	error, io, iter,
+	task::{Context, Poll},
+	time::Duration,
 };
-use std::{error, io, iter, task::{Context, Poll}, time::Duration};

 /// Builds two nodes that have each other as bootstrap nodes.
 /// This is to be used only for testing, and a panic will happen if something goes wrong.
@@ -45,12 +50,11 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 		.map(|_| format!("/memory/{}", rand::random::<u64>()).parse().unwrap())
 		.collect();

-	for index in 0 .. 2 {
+	for index in 0..2 {
 		let keypair = keypairs[index].clone();

-		let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
-			.into_authentic(&keypair)
-			.unwrap();
+		let noise_keys =
+			noise::Keypair::<noise::X25519Spec>::new().into_authentic(&keypair).unwrap();

 		let transport = MemoryTransport
 			.upgrade(upgrade::Version::V1)
@@ -60,48 +64,43 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 			.boxed();

 		let (peerset, _) = sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig {
-			sets: vec![
-				sc_peerset::SetConfig {
-					in_peers: 25,
-					out_peers: 25,
-					bootnodes: if index == 0 {
-						keypairs
-							.iter()
-							.skip(1)
-							.map(|keypair| keypair.public().into_peer_id())
-							.collect()
-					} else {
-						vec![]
-					},
-					reserved_nodes: Default::default(),
-					reserved_only: false,
-				}
-			],
+			sets: vec![sc_peerset::SetConfig {
+				in_peers: 25,
+				out_peers: 25,
+				bootnodes: if index == 0 {
+					keypairs.iter().skip(1).map(|keypair| keypair.public().into_peer_id()).collect()
+				} else {
+					vec![]
+				},
+				reserved_nodes: Default::default(),
+				reserved_only: false,
+			}],
 		});

 		let behaviour = CustomProtoWithAddr {
-			inner: Notifications::new(peerset, iter::once(ProtocolConfig {
-				name: "/foo".into(),
-				fallback_names: Vec::new(),
-				handshake: Vec::new(),
-				max_notification_size: 1024 * 1024
-			})),
+			inner: Notifications::new(
+				peerset,
+				iter::once(ProtocolConfig {
+					name: "/foo".into(),
+					fallback_names: Vec::new(),
+					handshake: Vec::new(),
+					max_notification_size: 1024 * 1024,
+				}),
+			),
 			addrs: addrs
 				.iter()
 				.enumerate()
-				.filter_map(|(n, a)| if n != index {
-					Some((keypairs[n].public().into_peer_id(), a.clone()))
-				} else {
-					None
+				.filter_map(|(n, a)| {
+					if n != index {
+						Some((keypairs[n].public().into_peer_id(), a.clone()))
+					} else {
+						None
+					}
 				})
 				.collect(),
 		};

-		let mut swarm = Swarm::new(
-			transport,
-			behaviour,
-			keypairs[index].public().into_peer_id()
-		);
+		let mut swarm = Swarm::new(transport, behaviour, keypairs[index].public().into_peer_id());
 		swarm.listen_on(addrs[index].clone()).unwrap();
 		out.push(swarm);
 	}
@@ -159,11 +158,21 @@ impl NetworkBehaviour for CustomProtoWithAddr {
 		self.inner.inject_disconnected(peer_id)
 	}

-	fn inject_connection_established(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_established(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.inner.inject_connection_established(peer_id, conn, endpoint)
 	}

-	fn inject_connection_closed(&mut self, peer_id: &PeerId, conn: &ConnectionId, endpoint: &ConnectedPoint) {
+	fn inject_connection_closed(
+		&mut self,
+		peer_id: &PeerId,
+		conn: &ConnectionId,
+		endpoint: &ConnectedPoint,
+	) {
 		self.inner.inject_connection_closed(peer_id, conn, endpoint)
 	}

@@ -171,7 +180,7 @@ impl NetworkBehaviour for CustomProtoWithAddr {
 		&mut self,
 		peer_id: PeerId,
 		connection: ConnectionId,
-		event: <<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::OutEvent
+		event: <<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::OutEvent,
 	) {
 		self.inner.inject_event(peer_id, connection, event)
 	}
@@ -185,11 +194,16 @@ impl NetworkBehaviour for CustomProtoWithAddr {
 			<<Self::ProtocolsHandler as IntoProtocolsHandler>::Handler as ProtocolsHandler>::InEvent,
 			Self::OutEvent
 		>
-	> {
+	>{
 		self.inner.poll(cx, params)
 	}

-	fn inject_addr_reach_failure(&mut self, peer_id: Option<&PeerId>, addr: &Multiaddr, error: &dyn std::error::Error) {
+	fn inject_addr_reach_failure(
+		&mut self,
+		peer_id: Option<&PeerId>,
+		addr: &Multiaddr,
+		error: &dyn std::error::Error,
+	) {
 		self.inner.inject_addr_reach_failure(peer_id, addr, error)
 	}

@@ -235,7 +249,12 @@ fn reconnect_after_disconnect() {

 	// For this test, the services can be in the following states.
 	#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-	enum ServiceState { NotConnected, FirstConnec, Disconnected, ConnectedAgain }
+	enum ServiceState {
+		NotConnected,
+		FirstConnec,
+		Disconnected,
+		ConnectedAgain,
+	}
 	let mut service1_state = ServiceState::NotConnected;
 	let mut service2_state = ServiceState::NotConnected;

@@ -253,55 +272,55 @@ fn reconnect_after_disconnect() {
 			};

 			match event {
-				future::Either::Left(NotificationsOut::CustomProtocolOpen { .. }) => {
+				future::Either::Left(NotificationsOut::CustomProtocolOpen { .. }) =>
 					match service1_state {
 						ServiceState::NotConnected => {
 							service1_state = ServiceState::FirstConnec;
 							if service2_state == ServiceState::FirstConnec {
 								service1.behaviour_mut().disconnect_peer(
 									Swarm::local_peer_id(&service2),
-									sc_peerset::SetId::from(0)
+									sc_peerset::SetId::from(0),
 								);
 							}
 						},
 						ServiceState::Disconnected => service1_state = ServiceState::ConnectedAgain,
 						ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
-					}
-				},
-				future::Either::Left(NotificationsOut::CustomProtocolClosed { .. }) => {
+					},
+				future::Either::Left(NotificationsOut::CustomProtocolClosed { .. }) =>
 					match service1_state {
 						ServiceState::FirstConnec => service1_state = ServiceState::Disconnected,
-						ServiceState::ConnectedAgain| ServiceState::NotConnected |
+						ServiceState::ConnectedAgain |
+						ServiceState::NotConnected |
 						ServiceState::Disconnected => panic!(),
-					}
-				},
-				future::Either::Right(NotificationsOut::CustomProtocolOpen { .. }) => {
+					},
+				future::Either::Right(NotificationsOut::CustomProtocolOpen { .. }) =>
 					match service2_state {
 						ServiceState::NotConnected => {
 							service2_state = ServiceState::FirstConnec;
 							if service1_state == ServiceState::FirstConnec {
 								service1.behaviour_mut().disconnect_peer(
 									Swarm::local_peer_id(&service2),
-									sc_peerset::SetId::from(0)
+									sc_peerset::SetId::from(0),
 								);
 							}
 						},
 						ServiceState::Disconnected => service2_state = ServiceState::ConnectedAgain,
 						ServiceState::FirstConnec | ServiceState::ConnectedAgain => panic!(),
-					}
-				},
-				future::Either::Right(NotificationsOut::CustomProtocolClosed { .. }) => {
+					},
+				future::Either::Right(NotificationsOut::CustomProtocolClosed { .. }) =>
 					match service2_state {
 						ServiceState::FirstConnec => service2_state = ServiceState::Disconnected,
-						ServiceState::ConnectedAgain| ServiceState::NotConnected |
+						ServiceState::ConnectedAgain |
+						ServiceState::NotConnected |
 						ServiceState::Disconnected => panic!(),
-					}
-				},
-				_ => {}
+					},
+				_ => {},
 			}

-			if service1_state == ServiceState::ConnectedAgain && service2_state == ServiceState::ConnectedAgain {
-				break;
+			if service1_state == ServiceState::ConnectedAgain &&
+				service2_state == ServiceState::ConnectedAgain
+			{
+				break
 			}
 		}

@@ -316,7 +335,7 @@ fn reconnect_after_disconnect() {
 				let s2 = service2.next();
 				futures::pin_mut!(s1, s2);
 				match future::select(future::select(s1, s2), &mut delay).await {
-					future::Either::Right(_) => break,	// success
+					future::Either::Right(_) => break, // success
 					future::Either::Left((future::Either::Left((ev, _)), _)) => ev,
 					future::Either::Left((future::Either::Right((ev, _)), _)) => ev,
 				}
@@ -325,7 +344,7 @@ fn reconnect_after_disconnect() {
 			match event {
 				NotificationsOut::CustomProtocolOpen { .. } |
 				NotificationsOut::CustomProtocolClosed { .. } => panic!(),
-				_ => {}
+				_ => {},
 			}
 		}
 	});