Nightly fmt

paritytech · paritytech-processbot · Oct 22, 2022 · Oct 13, 2022 · Oct 13, 2022 · Oct 13, 2022
commit ce8aba9da63b52288eb2c252e1e63fc3e7a2240d
diff --git a/node/primitives/src/disputes/message.rs b/node/primitives/src/disputes/message.rs
@@ -223,8 +223,7 @@ impl UncheckedDisputeMessage {
 
 		let vote_valid = {
 			let ValidDisputeVote { validator_index, signature, kind } = valid_vote;
-			let validator_public =
-				session_info.validators.get(validator_index).ok_or(())?.clone();
+			let validator_public = session_info.validators.get(validator_index).ok_or(())?.clone();
 
 			(
 				SignedDisputeStatement::new_checked(
@@ -240,8 +239,7 @@ impl UncheckedDisputeMessage {
 
 		let vote_invalid = {
 			let InvalidDisputeVote { validator_index, signature, kind } = invalid_vote;
-			let validator_public =
-				session_info.validators.get(validator_index).ok_or(())?.clone();
+			let validator_public = session_info.validators.get(validator_index).ok_or(())?.clone();
 
 			(
 				SignedDisputeStatement::new_checked(

diff --git a/node/subsystem-util/src/rolling_session_window.rs b/node/subsystem-util/src/rolling_session_window.rs
@@ -392,7 +392,7 @@ mod tests {
 		SubsystemContext,
 	};
 	use polkadot_node_subsystem_test_helpers::make_subsystem_context;
-	use polkadot_primitives::v2::{Header, Validators, GroupValidators};
+	use polkadot_primitives::v2::{GroupValidators, Header, Validators};
 	use sp_core::testing::TaskExecutor;
 
 	pub const TEST_WINDOW_SIZE: SessionWindowSize = new_session_window_size!(6);

diff --git a/primitives/src/v2/mod.rs b/primitives/src/v2/mod.rs
@@ -19,8 +19,7 @@
 use bitvec::vec::BitVec;
 use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
-use sp_std::prelude::*;
-use sp_std::ops::Index;
+use sp_std::{ops::Index, prelude::*};
 
 use application_crypto::KeyTypeId;
 use inherents::InherentIdentifier;
@@ -1573,30 +1572,30 @@ impl CompactStatement {
 /// Validators struct indexed by ValidatorIndex.
 #[derive(Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))]
-pub struct Validators (Vec<ValidatorId>);
+pub struct Validators(Vec<ValidatorId>);
 
-impl Index<ValidatorIndex> for Validators{
+impl Index<ValidatorIndex> for Validators {
 	type Output = ValidatorId;
 
 	fn index(&self, index: ValidatorIndex) -> &Self::Output {
 		&self.0.get(index.0 as usize).unwrap()
 	}
 }
 
-impl From<Vec<ValidatorId>> for Validators{
+impl From<Vec<ValidatorId>> for Validators {
 	fn from(validators: Vec<ValidatorId>) -> Self {
 		Validators(validators)
 	}
 }
 
 impl Validators {
 	/// Returns a reference to an element indexed using ValidatorIndex.
-	pub fn get(&self, index: ValidatorIndex) -> Option<&ValidatorId>{
+	pub fn get(&self, index: ValidatorIndex) -> Option<&ValidatorId> {
 		self.0.get(index.0 as usize)
 	}
 
 	///Returns number of elements in vector.
-	pub fn len(&self) -> usize{
+	pub fn len(&self) -> usize {
 		self.0.len()
 	}
 
@@ -1609,30 +1608,30 @@ impl Validators {
 /// GroupValidators struct indexed by GroupIndex.
 #[derive(Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 #[cfg_attr(feature = "std", derive(PartialEq, MallocSizeOf))]
-pub struct GroupValidators (Vec<Vec<ValidatorIndex>>);
+pub struct GroupValidators(Vec<Vec<ValidatorIndex>>);
 
-impl Index<GroupIndex> for GroupValidators{
+impl Index<GroupIndex> for GroupValidators {
 	type Output = Vec<ValidatorIndex>;
 
 	fn index(&self, index: GroupIndex) -> &Self::Output {
 		self.0.get(index.0 as usize).unwrap()
 	}
 }
 
-impl From<Vec<Vec<ValidatorIndex>>> for GroupValidators{
+impl From<Vec<Vec<ValidatorIndex>>> for GroupValidators {
 	fn from(group_validators: Vec<Vec<ValidatorIndex>>) -> Self {
 		GroupValidators(group_validators)
 	}
 }
 
 impl GroupValidators {
 	/// Returns a reference to an element indexed using GroupIndex.
-	pub fn get(&self, index: GroupIndex) -> Option<&Vec<ValidatorIndex>>{
+	pub fn get(&self, index: GroupIndex) -> Option<&Vec<ValidatorIndex>> {
 		self.0.get(index.0 as usize)
 	}
 
 	///Returns number of elements in vector.
-	pub fn len(&self) -> usize{
+	pub fn len(&self) -> usize {
 		self.0.len()
 	}
 

diff --git a/runtime/parachains/src/builder.rs b/runtime/parachains/src/builder.rs
@@ -21,7 +21,15 @@ use crate::{
 };
 use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec};
 use frame_support::pallet_prelude::*;
-use primitives::v2::{collator_signature_payload, AvailabilityBitfield, BackedCandidate, CandidateCommitments, CandidateDescriptor, CandidateHash, CollatorId, CollatorSignature, CommittedCandidateReceipt, CompactStatement, CoreIndex, CoreOccupied, DisputeStatement, DisputeStatementSet, GroupIndex, HeadData, Id as ParaId, InherentData as ParachainsInherentData, InvalidDisputeStatementKind, PersistedValidationData, SessionIndex, SigningContext, UncheckedSigned, ValidDisputeStatementKind, ValidationCode, ValidatorId, ValidatorIndex, ValidityAttestation, Validators};
+use primitives::v2::{
+	collator_signature_payload, AvailabilityBitfield, BackedCandidate, CandidateCommitments,
+	CandidateDescriptor, CandidateHash, CollatorId, CollatorSignature, CommittedCandidateReceipt,
+	CompactStatement, CoreIndex, CoreOccupied, DisputeStatement, DisputeStatementSet, GroupIndex,
+	HeadData, Id as ParaId, InherentData as ParachainsInherentData, InvalidDisputeStatementKind,
+	PersistedValidationData, SessionIndex, SigningContext, UncheckedSigned,
+	ValidDisputeStatementKind, ValidationCode, ValidatorId, ValidatorIndex, Validators,
+	ValidityAttestation,
+};
 use sp_core::{sr25519, H256};
 use sp_runtime::{
 	generic::Digest,

diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs
@@ -985,8 +985,7 @@ impl<T: Config> Pallet<T> {
 			let mut importer = DisputeStateImporter::new(dispute_state, now);
 			for (i, (statement, validator_index, signature)) in set.statements.iter().enumerate() {
 				// assure the validator index and is present in the session info
-				let validator_public = match session_info.validators.get(*validator_index)
-				{
+				let validator_public = match session_info.validators.get(*validator_index) {
 					None => {
 						filter.remove_index(i);
 						continue