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/frame/node-authorization/src/lib.rs

@@ -44,22 +44,15 @@ mod tests;
 
 pub mod weights;
 
-use sp_core::OpaquePeerId as PeerId;
-use sp_std::{
-	collections::btree_set::BTreeSet,
-	iter::FromIterator,
-	prelude::*,
-};
 pub use pallet::*;
+use sp_core::OpaquePeerId as PeerId;
+use sp_std::{collections::btree_set::BTreeSet, iter::FromIterator, prelude::*};
 pub use weights::WeightInfo;
 
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::{
-		dispatch::DispatchResult,
-		pallet_prelude::*,
-	};
+	use frame_support::{dispatch::DispatchResult, pallet_prelude::*};
 	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
@@ -104,23 +97,13 @@ pub mod pallet {
 	/// A map that maintains the ownership of each node.
 	#[pallet::storage]
 	#[pallet::getter(fn owners)]
-	pub type Owners<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		PeerId,
-		T::AccountId,
-	>;
+	pub type Owners<T: Config> = StorageMap<_, Blake2_128Concat, PeerId, T::AccountId>;
 
 	/// The additional adapative connections of each node.
 	#[pallet::storage]
 	#[pallet::getter(fn additional_connection)]
-	pub type AdditionalConnections<T> = StorageMap<
-		_,
-		Blake2_128Concat,
-		PeerId,
-		BTreeSet<PeerId>,
-		ValueQuery,
-	>;
+	pub type AdditionalConnections<T> =
+		StorageMap<_, Blake2_128Concat, PeerId, BTreeSet<PeerId>, ValueQuery>;
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
@@ -208,10 +191,10 @@ pub mod pallet {
 						),
 						Ok(node) => sp_io::offchain::set_authorized_nodes(
 							Self::get_authorized_nodes(&PeerId(node)),
-							true
-						)
+							true,
+						),
 					}
-				}
+				},
 			}
 		}
 	}
@@ -228,7 +211,7 @@ pub mod pallet {
 		pub fn add_well_known_node(
 			origin: OriginFor<T>,
 			node: PeerId,
-			owner: T::AccountId
+			owner: T::AccountId,
 		) -> DispatchResult {
 			T::AddOrigin::ensure_origin(origin)?;
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
@@ -281,16 +264,15 @@ pub mod pallet {
 		pub fn swap_well_known_node(
 			origin: OriginFor<T>,
 			remove: PeerId,
-			add: PeerId
+			add: PeerId,
 		) -> DispatchResult {
 			T::SwapOrigin::ensure_origin(origin)?;
-			ensure!(
-				remove.0.len() < T::MaxPeerIdLength::get() as usize,
-				Error::<T>::PeerIdTooLong
-			);
+			ensure!(remove.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
 			ensure!(add.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
 
-			if remove == add { return Ok(()) }
+			if remove == add {
+				return Ok(())
+			}
 
 			let mut nodes = WellKnownNodes::<T>::get();
 			ensure!(nodes.contains(&remove), Error::<T>::NotExist);
@@ -317,7 +299,7 @@ pub mod pallet {
 		#[pallet::weight((T::WeightInfo::reset_well_known_nodes(), DispatchClass::Operational))]
 		pub fn reset_well_known_nodes(
 			origin: OriginFor<T>,
-			nodes: Vec<(PeerId, T::AccountId)>
+			nodes: Vec<(PeerId, T::AccountId)>,
 		) -> DispatchResult {
 			T::ResetOrigin::ensure_origin(origin)?;
 			ensure!(nodes.len() < T::MaxWellKnownNodes::get() as usize, Error::<T>::TooManyNodes);
@@ -337,7 +319,7 @@ pub mod pallet {
 			let sender = ensure_signed(origin)?;
 
 			ensure!(node.0.len() < T::MaxPeerIdLength::get() as usize, Error::<T>::PeerIdTooLong);
-			ensure!(!Owners::<T>::contains_key(&node),Error::<T>::AlreadyClaimed);
+			ensure!(!Owners::<T>::contains_key(&node), Error::<T>::AlreadyClaimed);
 
 			Owners::<T>::insert(&node, &sender);
 			Self::deposit_event(Event::NodeClaimed(node, sender));
@@ -373,7 +355,7 @@ pub mod pallet {
 		pub fn transfer_node(
 			origin: OriginFor<T>,
 			node: PeerId,
-			owner: T::AccountId
+			owner: T::AccountId,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
@@ -395,7 +377,7 @@ pub mod pallet {
 		pub fn add_connections(
 			origin: OriginFor<T>,
 			node: PeerId,
-			connections: Vec<PeerId>
+			connections: Vec<PeerId>,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
@@ -407,7 +389,7 @@ pub mod pallet {
 
 			for add_node in connections.iter() {
 				if *add_node == node {
-					continue;
+					continue
 				}
 				nodes.insert(add_node.clone());
 			}
@@ -426,7 +408,7 @@ pub mod pallet {
 		pub fn remove_connections(
 			origin: OriginFor<T>,
 			node: PeerId,
-			connections: Vec<PeerId>
+			connections: Vec<PeerId>,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin)?;
 
@@ -450,9 +432,7 @@ pub mod pallet {
 
 impl<T: Config> Pallet<T> {
 	fn initialize_nodes(nodes: &Vec<(PeerId, T::AccountId)>) {
-		let peer_ids = nodes.iter()
-			.map(|item| item.0.clone())
-			.collect::<BTreeSet<PeerId>>();
+		let peer_ids = nodes.iter().map(|item| item.0.clone()).collect::<BTreeSet<PeerId>>();
 		WellKnownNodes::<T>::put(&peer_ids);
 
 		for (node, who) in nodes.iter() {

substrate/frame/node-authorization/src/mock.rs

@@ -20,13 +20,13 @@
 use super::*;
 use crate as pallet_node_authorization;
 
-use frame_support::{
-	parameter_types, ord_parameter_types,
-	traits::GenesisBuild,
-};
+use frame_support::{ord_parameter_types, parameter_types, traits::GenesisBuild};
 use frame_system::EnsureSignedBy;
 use sp_core::H256;
-use sp_runtime::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
+use sp_runtime::{
+	testing::Header,
+	traits::{BlakeTwo256, IdentityLookup},
+};
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -102,6 +102,8 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	pallet_node_authorization::GenesisConfig::<Test> {
 		nodes: vec![(test_node(10), 10), (test_node(20), 20), (test_node(30), 30)],
-	}.assimilate_storage(&mut t).unwrap();
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
 	t.into()
 }

substrate/frame/node-authorization/src/tests.rs

@@ -19,7 +19,7 @@
 
 use super::*;
 use crate::mock::*;
-use frame_support::{assert_ok, assert_noop};
+use frame_support::{assert_noop, assert_ok};
 use sp_runtime::traits::BadOrigin;
 
 #[test]
@@ -38,9 +38,7 @@ fn add_well_known_node_works() {
 			Error::<Test>::AlreadyJoined
 		);
 
-		assert_ok!(
-			NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(15), 15)
-		);
+		assert_ok!(NodeAuthorization::add_well_known_node(Origin::signed(1), test_node(15), 15));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(10), test_node(15), test_node(20), test_node(30)])
@@ -75,13 +73,11 @@ fn remove_well_known_node_works() {
 
 		AdditionalConnections::<Test>::insert(
 			test_node(20),
-			BTreeSet::from_iter(vec![test_node(40)])
+			BTreeSet::from_iter(vec![test_node(40)]),
 		);
 		assert!(AdditionalConnections::<Test>::contains_key(test_node(20)));
 
-		assert_ok!(
-			NodeAuthorization::remove_well_known_node(Origin::signed(2), test_node(20))
-		);
+		assert_ok!(NodeAuthorization::remove_well_known_node(Origin::signed(2), test_node(20)));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(10), test_node(30)])
@@ -95,56 +91,58 @@ fn remove_well_known_node_works() {
 fn swap_well_known_node_works() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
-			NodeAuthorization::swap_well_known_node(
-				Origin::signed(4), test_node(20), test_node(5)
-			),
+			NodeAuthorization::swap_well_known_node(Origin::signed(4), test_node(20), test_node(5)),
 			BadOrigin
 		);
 		assert_noop!(
 			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), PeerId(vec![1, 2, 3]), test_node(20)
+				Origin::signed(3),
+				PeerId(vec![1, 2, 3]),
+				test_node(20)
 			),
 			Error::<Test>::PeerIdTooLong
 		);
 		assert_noop!(
 			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(20), PeerId(vec![1, 2, 3])
+				Origin::signed(3),
+				test_node(20),
+				PeerId(vec![1, 2, 3])
 			),
 			Error::<Test>::PeerIdTooLong
 		);
 
-		assert_ok!(
-			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(20), test_node(20)
-			)
-		);
+		assert_ok!(NodeAuthorization::swap_well_known_node(
+			Origin::signed(3),
+			test_node(20),
+			test_node(20)
+		));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(10), test_node(20), test_node(30)])
 		);
 
 		assert_noop!(
-			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(15), test_node(5)
-			),
+			NodeAuthorization::swap_well_known_node(Origin::signed(3), test_node(15), test_node(5)),
 			Error::<Test>::NotExist
 		);
 		assert_noop!(
 			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(20), test_node(30)
+				Origin::signed(3),
+				test_node(20),
+				test_node(30)
 			),
 			Error::<Test>::AlreadyJoined
 		);
 
 		AdditionalConnections::<Test>::insert(
 			test_node(20),
-			BTreeSet::from_iter(vec![test_node(15)])
-		);
-		assert_ok!(
-			NodeAuthorization::swap_well_known_node(
-				Origin::signed(3), test_node(20), test_node(5)
-			)
+			BTreeSet::from_iter(vec![test_node(15)]),
 		);
+		assert_ok!(NodeAuthorization::swap_well_known_node(
+			Origin::signed(3),
+			test_node(20),
+			test_node(5)
+		));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(5), test_node(10), test_node(30)])
@@ -182,12 +180,10 @@ fn reset_well_known_nodes_works() {
 			Error::<Test>::TooManyNodes
 		);
 
-		assert_ok!(
-			NodeAuthorization::reset_well_known_nodes(
-				Origin::signed(4),
-				vec![(test_node(15), 15), (test_node(5), 5), (test_node(20), 20)]
-			)
-		);
+		assert_ok!(NodeAuthorization::reset_well_known_nodes(
+			Origin::signed(4),
+			vec![(test_node(15), 15), (test_node(5), 5), (test_node(20), 20)]
+		));
 		assert_eq!(
 			WellKnownNodes::<Test>::get(),
 			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(20)])
@@ -240,7 +236,7 @@ fn remove_claim_works() {
 		Owners::<Test>::insert(test_node(15), 15);
 		AdditionalConnections::<Test>::insert(
 			test_node(15),
-			BTreeSet::from_iter(vec![test_node(20)])
+			BTreeSet::from_iter(vec![test_node(20)]),
 		);
 		assert_ok!(NodeAuthorization::remove_claim(Origin::signed(15), test_node(15)));
 		assert!(!Owners::<Test>::contains_key(test_node(15)));
@@ -275,31 +271,35 @@ fn add_connections_works() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
 			NodeAuthorization::add_connections(
-				Origin::signed(15), PeerId(vec![1, 2, 3]), vec![test_node(5)]
+				Origin::signed(15),
+				PeerId(vec![1, 2, 3]),
+				vec![test_node(5)]
 			),
 			Error::<Test>::PeerIdTooLong
 		);
 		assert_noop!(
 			NodeAuthorization::add_connections(
-				Origin::signed(15), test_node(15), vec![test_node(5)]
+				Origin::signed(15),
+				test_node(15),
+				vec![test_node(5)]
 			),
 			Error::<Test>::NotClaimed
 		);
 
 		assert_noop!(
 			NodeAuthorization::add_connections(
-				Origin::signed(15), test_node(20), vec![test_node(5)]
+				Origin::signed(15),
+				test_node(20),
+				vec![test_node(5)]
 			),
 			Error::<Test>::NotOwner
 		);
 
-		assert_ok!(
-			NodeAuthorization::add_connections(
-				Origin::signed(20),
-				test_node(20),
-				vec![test_node(15), test_node(5), test_node(25), test_node(20)]
-			)
-		);
+		assert_ok!(NodeAuthorization::add_connections(
+			Origin::signed(20),
+			test_node(20),
+			vec![test_node(15), test_node(5), test_node(25), test_node(20)]
+		));
 		assert_eq!(
 			AdditionalConnections::<Test>::get(test_node(20)),
 			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
@@ -312,35 +312,39 @@ fn remove_connections_works() {
 	new_test_ext().execute_with(|| {
 		assert_noop!(
 			NodeAuthorization::remove_connections(
-				Origin::signed(15), PeerId(vec![1, 2, 3]), vec![test_node(5)]
+				Origin::signed(15),
+				PeerId(vec![1, 2, 3]),
+				vec![test_node(5)]
 			),
 			Error::<Test>::PeerIdTooLong
 		);
 		assert_noop!(
 			NodeAuthorization::remove_connections(
-				Origin::signed(15), test_node(15), vec![test_node(5)]
+				Origin::signed(15),
+				test_node(15),
+				vec![test_node(5)]
 			),
 			Error::<Test>::NotClaimed
 		);
 
 		assert_noop!(
 			NodeAuthorization::remove_connections(
-				Origin::signed(15), test_node(20), vec![test_node(5)]
+				Origin::signed(15),
+				test_node(20),
+				vec![test_node(5)]
 			),
 			Error::<Test>::NotOwner
 		);
 
 		AdditionalConnections::<Test>::insert(
 			test_node(20),
-			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
-		);
-		assert_ok!(
-			NodeAuthorization::remove_connections(
-				Origin::signed(20),
-				test_node(20),
-				vec![test_node(15), test_node(5)]
-			)
+			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)]),
 		);
+		assert_ok!(NodeAuthorization::remove_connections(
+			Origin::signed(20),
+			test_node(20),
+			vec![test_node(15), test_node(5)]
+		));
 		assert_eq!(
 			AdditionalConnections::<Test>::get(test_node(20)),
 			BTreeSet::from_iter(vec![test_node(25)])
@@ -353,7 +357,7 @@ fn get_authorized_nodes_works() {
 	new_test_ext().execute_with(|| {
 		AdditionalConnections::<Test>::insert(
 			test_node(20),
-			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)])
+			BTreeSet::from_iter(vec![test_node(5), test_node(15), test_node(25)]),
 		);
 
 		let mut authorized_nodes = Pallet::<Test>::get_authorized_nodes(&test_node(20));

substrate/frame/node-authorization/src/weights.rs

@@ -17,6 +17,7 @@
 
 //! Autogenerated weights for pallet_node_authorization
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]