fmt

paritytech · eskimor · Mar 21, 2023 · May 6, 2022 · May 9, 2022 · May 11, 2022
commit 75f256d8a174ca708e2cd4d15968197b4c67dedd
diff --git a/runtime/parachains/src/slashing/benchmarking.rs b/runtime/parachains/src/slashing/benchmarking.rs
@@ -16,13 +16,13 @@
 
 use super::*;
 
-use crate::{initializer, shared, disputes::SlashingHandler};
+use crate::{disputes::SlashingHandler, initializer, shared};
 use frame_benchmarking::{benchmarks, whitelist_account};
+use frame_support::traits::{OnFinalize, OnInitialize};
 use frame_system::RawOrigin;
 use pallet_staking::testing_utils::create_validators;
-use sp_runtime::traits::{One, StaticLookup};
-use frame_support::traits::{OnInitialize, OnFinalize};
 use primitives::v2::{Hash, PARACHAIN_KEY_TYPE_ID};
+use sp_runtime::traits::{One, StaticLookup};
 use sp_session::MembershipProof;
 
 // Candidate hash of the disputed candidate.
@@ -31,9 +31,14 @@ const CANDIDATE_HASH: CandidateHash = CandidateHash(Hash::zero());
 const MAX_VALIDATORS: u32 = 1 * 1024;
 
 pub trait Config:
-	pallet_session::Config + pallet_session::historical::Config + pallet_staking::Config
-	+ super::Config + shared::Config + initializer::Config
-{}
+	pallet_session::Config
+	+ pallet_session::historical::Config
+	+ pallet_staking::Config
+	+ super::Config
+	+ shared::Config
+	+ initializer::Config
+{
+}
 
 fn setup_validator_set<T>(n: u32) -> (SessionIndex, MembershipProof, ValidatorId)
 where
@@ -62,11 +67,8 @@ where
 		let proof: Vec<u8> = vec![];
 
 		whitelist_account!(controller);
-		pallet_session::Pallet::<T>::set_keys(
-			RawOrigin::Signed(controller).into(),
-			keys,
-			proof,
-		).expect("session::set_keys should work");
+		pallet_session::Pallet::<T>::set_keys(RawOrigin::Signed(controller).into(), keys, proof)
+			.expect("session::set_keys should work");
 	}
 
 	pallet_session::Pallet::<T>::on_initialize(T::BlockNumber::one());
@@ -113,18 +115,11 @@ where
 
 	let validator_index = ValidatorIndex(0);
 
-	let losers = [
-		validator_index,
-	].into_iter();
+	let losers = [validator_index].into_iter();
 	// everyone else wins
 	let winners = (1..n_validators).map(|i| ValidatorIndex(i)).into_iter();
 
-	T::SlashingHandler::punish_against_valid(
-		session_index,
-		CANDIDATE_HASH,
-		losers,
-		winners,
-	);
+	T::SlashingHandler::punish_against_valid(session_index, CANDIDATE_HASH, losers, winners);
 
 	let losers = <PendingAgainstValidLosers<T>>::get(session_index, CANDIDATE_HASH);
 	assert_eq!(losers.unwrap().len(), 1);
@@ -140,12 +135,7 @@ fn dispute_proof(
 	let kind = SlashingOffenceKind::AgainstValid;
 	let time_slot = DisputesTimeSlot::new(session_index, CANDIDATE_HASH);
 
-	DisputeProof {
-		time_slot,
-		kind,
-		validator_index,
-		validator_id,
-	}
+	DisputeProof { time_slot, kind, validator_index, validator_id }
 }
 
 benchmarks! {

diff --git a/runtime/parachains/src/slashing/mod.rs b/runtime/parachains/src/slashing/mod.rs
@@ -30,9 +30,9 @@
 //!  because it is quite heavy.
 
 use crate::{
+	disputes,
 	initializer::ValidatorSetCount,
 	session_info::{AccountId, IdentificationTuple},
-	disputes,
 };
 use frame_support::{
 	traits::{Get, KeyOwnerProofSystem, ValidatorSet, ValidatorSetWithIdentification},
@@ -58,7 +58,6 @@ use sp_std::{
 
 const LOG_TARGET: &str = "runtime::slashing";
 
-
 #[cfg(feature = "runtime-benchmarks")]
 pub mod benchmarking;
 

diff --git a/runtime/test-runtime/src/lib.rs b/runtime/test-runtime/src/lib.rs
@@ -217,7 +217,8 @@ parameter_types! {
 }
 
 impl pallet_balances::Config for Runtime {
-	type Balance = Balance; type DustRemoval = ();
+	type Balance = Balance;
+	type DustRemoval = ();
 	type Event = Event;
 	type ExistentialDeposit = ExistentialDeposit;
 	type AccountStore = System;

diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
@@ -48,14 +48,13 @@ use runtime_common::{
 	BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate,
 };
 use runtime_parachains::{
-	configuration as parachains_configuration,
-	disputes as parachains_disputes, slashing as parachains_slashing,
+	configuration as parachains_configuration, disputes as parachains_disputes,
 	dmp as parachains_dmp, hrmp as parachains_hrmp, inclusion as parachains_inclusion,
 	initializer as parachains_initializer, origin as parachains_origin, paras as parachains_paras,
 	paras_inherent as parachains_paras_inherent, reward_points as parachains_reward_points,
-	runtime_api_impl::v2 as parachains_runtime_api_impl,
-	scheduler as parachains_scheduler, session_info as parachains_session_info,
-	shared as parachains_shared, ump as parachains_ump,
+	runtime_api_impl::v2 as parachains_runtime_api_impl, scheduler as parachains_scheduler,
+	session_info as parachains_session_info, shared as parachains_shared,
+	slashing as parachains_slashing, ump as parachains_ump,
 };
 use scale_info::TypeInfo;
 use sp_core::{OpaqueMetadata, RuntimeDebug};

diff --git a/runtime/westend/src/weights/mod.rs b/runtime/westend/src/weights/mod.rs
@@ -39,10 +39,10 @@ pub mod runtime_common_paras_registrar;
 pub mod runtime_common_slots;
 pub mod runtime_parachains_configuration;
 pub mod runtime_parachains_disputes;
-pub mod runtime_parachains_slashing;
 pub mod runtime_parachains_hrmp;
 pub mod runtime_parachains_initializer;
 pub mod runtime_parachains_paras;
 pub mod runtime_parachains_paras_inherent;
+pub mod runtime_parachains_slashing;
 pub mod runtime_parachains_ump;
 pub mod xcm;