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-05-01 13:37:57 +00:00 · 2021-07-21 16:32:32 +02:00
parent d451c38c1c
commit 7b56ab15b4
1010 changed files with 53339 additions and 51208 deletions
@@ -17,13 +17,16 @@

 //! Substrate changes trie configuration.

-#[cfg(any(feature = "std", test))]
-use serde::{Serialize, Deserialize};
-use codec::{Encode, Decode};
+use codec::{Decode, Encode};
 use num_traits::Zero;
+#[cfg(any(feature = "std", test))]
+use serde::{Deserialize, Serialize};

 /// Substrate changes trie configuration.
-#[cfg_attr(any(feature = "std", test), derive(Serialize, Deserialize, parity_util_mem::MallocSizeOf))]
+#[cfg_attr(
+	any(feature = "std", test),
+	derive(Serialize, Deserialize, parity_util_mem::MallocSizeOf)
+)]
 #[derive(Debug, Clone, PartialEq, Eq, Default, Encode, Decode)]
 pub struct ChangesTrieConfiguration {
 	/// Interval (in blocks) at which level1-digests are created. Digests are not
@@ -62,32 +65,31 @@ impl ChangesTrieConfiguration {
 	}

 	/// Do we need to build digest at given block?
-	pub fn is_digest_build_required_at_block<Number>(
-		&self,
-		zero: Number,
-		block: Number,
-	) -> bool
-		where
-			Number: From<u32> + PartialEq +
-			::sp_std::ops::Rem<Output=Number> + ::sp_std::ops::Sub<Output=Number> +
-			::sp_std::cmp::PartialOrd + Zero,
+	pub fn is_digest_build_required_at_block<Number>(&self, zero: Number, block: Number) -> bool
+	where
+		Number: From<u32>
+			+ PartialEq
+			+ ::sp_std::ops::Rem<Output = Number>
+			+ ::sp_std::ops::Sub<Output = Number>
+			+ ::sp_std::cmp::PartialOrd
+			+ Zero,
 	{
-		block > zero
-			&& self.is_digest_build_enabled()
-			&& ((block - zero) % self.digest_interval.into()).is_zero()
+		block > zero &&
+			self.is_digest_build_enabled() &&
+			((block - zero) % self.digest_interval.into()).is_zero()
 	}

 	/// Returns max digest interval. One if digests are not created at all.
 	pub fn max_digest_interval(&self) -> u32 {
 		if !self.is_digest_build_enabled() {
-			return 1;
+			return 1
 		}

 		// we'll get >1 loop iteration only when bad configuration parameters are selected
 		let mut current_level = self.digest_levels;
 		loop {
 			if let Some(max_digest_interval) = self.digest_interval.checked_pow(current_level) {
-				return max_digest_interval;
+				return max_digest_interval
 			}

 			current_level -= 1;
@@ -97,25 +99,28 @@ impl ChangesTrieConfiguration {
 	/// Returns max level digest block number that has been created at block <= passed block number.
 	///
 	/// Returns None if digests are not created at all.
-	pub fn prev_max_level_digest_block<Number>(
-		&self,
-		zero: Number,
-		block: Number,
-	) -> Option<Number>
-		where
-			Number: Clone + From<u32> + PartialOrd + PartialEq +
-			::sp_std::ops::Add<Output=Number> + ::sp_std::ops::Sub<Output=Number> +
-			::sp_std::ops::Div<Output=Number> + ::sp_std::ops::Mul<Output=Number> + Zero,
+	pub fn prev_max_level_digest_block<Number>(&self, zero: Number, block: Number) -> Option<Number>
+	where
+		Number: Clone
+			+ From<u32>
+			+ PartialOrd
+			+ PartialEq
+			+ ::sp_std::ops::Add<Output = Number>
+			+ ::sp_std::ops::Sub<Output = Number>
+			+ ::sp_std::ops::Div<Output = Number>
+			+ ::sp_std::ops::Mul<Output = Number>
+			+ Zero,
 	{
 		if block <= zero {
-			return None;
+			return None
 		}

-		let (next_begin, next_end) = self.next_max_level_digest_range(zero.clone(), block.clone())?;
+		let (next_begin, next_end) =
+			self.next_max_level_digest_range(zero.clone(), block.clone())?;

 		// if 'next' digest includes our block, then it is a also a previous digest
 		if next_end == block {
-			return Some(block);
+			return Some(block)
 		}

 		// if previous digest ends at zero block, then there are no previous digest
@@ -136,13 +141,18 @@ impl ChangesTrieConfiguration {
 		zero: Number,
 		mut block: Number,
 	) -> Option<(Number, Number)>
-		where
-			Number: Clone + From<u32> + PartialOrd + PartialEq +
-			::sp_std::ops::Add<Output=Number> + ::sp_std::ops::Sub<Output=Number> +
-			::sp_std::ops::Div<Output=Number> + ::sp_std::ops::Mul<Output=Number>,
+	where
+		Number: Clone
+			+ From<u32>
+			+ PartialOrd
+			+ PartialEq
+			+ ::sp_std::ops::Add<Output = Number>
+			+ ::sp_std::ops::Sub<Output = Number>
+			+ ::sp_std::ops::Div<Output = Number>
+			+ ::sp_std::ops::Mul<Output = Number>,
 	{
 		if !self.is_digest_build_enabled() {
-			return None;
+			return None
 		}

 		if block <= zero {
@@ -152,7 +162,7 @@ impl ChangesTrieConfiguration {
 		let max_digest_interval: Number = self.max_digest_interval().into();
 		let max_digests_since_zero = (block.clone() - zero.clone()) / max_digest_interval.clone();
 		if max_digests_since_zero == 0.into() {
-			return Some((zero.clone() + 1.into(), zero + max_digest_interval));
+			return Some((zero.clone() + 1.into(), zero + max_digest_interval))
 		}
 		let last_max_digest_block = zero + max_digests_since_zero * max_digest_interval.clone();
 		Some(if block == last_max_digest_block {
@@ -169,14 +179,22 @@ impl ChangesTrieConfiguration {
 	///  digest interval (in blocks)
 	///  step between blocks we're interested in when digest is built
 	/// )
-	pub fn digest_level_at_block<Number>(&self, zero: Number, block: Number) -> Option<(u32, u32, u32)>
-		where
-			Number: Clone + From<u32> + PartialEq +
-			::sp_std::ops::Rem<Output=Number> + ::sp_std::ops::Sub<Output=Number> +
-			::sp_std::cmp::PartialOrd + Zero,
+	pub fn digest_level_at_block<Number>(
+		&self,
+		zero: Number,
+		block: Number,
+	) -> Option<(u32, u32, u32)>
+	where
+		Number: Clone
+			+ From<u32>
+			+ PartialEq
+			+ ::sp_std::ops::Rem<Output = Number>
+			+ ::sp_std::ops::Sub<Output = Number>
+			+ ::sp_std::cmp::PartialOrd
+			+ Zero,
 	{
 		if !self.is_digest_build_required_at_block(zero.clone(), block.clone()) {
-			return None;
+			return None
 		}

 		let relative_block = block - zero;
@@ -185,8 +203,9 @@ impl ChangesTrieConfiguration {
 		let mut digest_step = 1u32;
 		while current_level < self.digest_levels {
 			let new_digest_interval = match digest_interval.checked_mul(self.digest_interval) {
-				Some(new_digest_interval) if (relative_block.clone() % new_digest_interval.into()).is_zero()
-					=> new_digest_interval,
+				Some(new_digest_interval)
+					if (relative_block.clone() % new_digest_interval.into()).is_zero() =>
+					new_digest_interval,
 				_ => break,
 			};

@@ -195,11 +214,7 @@ impl ChangesTrieConfiguration {
 			current_level += 1;
 		}

-		Some((
-			current_level,
-			digest_interval,
-			digest_step,
-		))
+		Some((current_level, digest_interval, digest_step))
 	}
 }

@@ -208,10 +223,7 @@ mod tests {
 	use super::ChangesTrieConfiguration;

 	fn config(interval: u32, levels: u32) -> ChangesTrieConfiguration {
-		ChangesTrieConfiguration {
-			digest_interval: interval,
-			digest_levels: levels,
-		}
+		ChangesTrieConfiguration { digest_interval: interval, digest_levels: levels }
 	}

 	#[test]
@@ -255,7 +267,10 @@ mod tests {
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 8u64), Some((1, 8, 1)));
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 64u64), Some((2, 64, 8)));
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 512u64), Some((3, 512, 64)));
-			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 4096u64), Some((4, 4096, 512)));
+			assert_eq!(
+				config(8, 4).digest_level_at_block(zero, zero + 4096u64),
+				Some((4, 4096, 512))
+			);
 			assert_eq!(config(8, 4).digest_level_at_block(zero, zero + 4112u64), Some((1, 8, 1)));
 		}