More :clean:

frame/staking/src/lib.rs

@@ -274,14 +274,15 @@
 #![recursion_limit = "128"]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(any(feature = "runtime-benchmarks", test))]
-pub mod benchmarking;
-#[cfg(any(test, feature = "make-bags"))]
-pub mod mock;
-#[cfg(any(feature = "runtime-benchmarks", test))]
-pub mod testing_utils;
+#[cfg(test)]
+mod mock;
 #[cfg(test)]
 mod tests;
+#[cfg(any(feature = "runtime-benchmarks", test))]
+pub mod testing_utils;
+#[cfg(any(feature = "runtime-benchmarks", test))]
+pub mod benchmarking;
+
 
 pub mod inflation;
 pub mod slashing;

frame/staking/src/mock/voter_bags.rs

@@ -32,5 +32,4 @@ pub const CONSTANT_RATIO: f64 = 2.0000000000000000;
 
 /// Upper thresholds delimiting the bag list.
 // pub const THRESHOLDS: [u64; 65] = [5, 15, 25, 50, 100, 1000, 2000, 3000]; // TODO: switch to this
-// @kian I am using the below because it is easier to calculate the next threshold in a loop
 pub const THRESHOLDS: [u64; 9] = [10, 20, 30, 40, 50, 60, 1_000, 2_000, 10_000];

frame/staking/src/voter_bags.rs

@@ -524,7 +524,7 @@ impl<T: Config> Bag<T> {
 		assert!(self
 			.tail()
 			.and_then(|tail| Some(tail.next().is_none()))
-			// if there is no head, then there must not be a tail
+			// if there is no tail, then there must not be a head
 			.unwrap_or_else(|| self.head.is_none()));
 		// 3) Iterate all voters and ensure that there are no loops.
 		let mut seen_in_bag = BTreeSet::new();