Mo cleanin

frame/staking/src/lib.rs

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

frame/staking/src/mock.rs

@@ -92,7 +92,7 @@ pub fn is_disabled(controller: AccountId) -> bool {
 }
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-pub(crate) type Block = frame_system::mocking::MockBlock<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
 
 frame_support::construct_runtime!(
 	pub enum Test where

utils/frame/remote-externalities/src/lib.rs

@@ -315,12 +315,6 @@ impl<B: BlockT> Builder<B> {
 				key_values.push((key.clone(), value));
 				if key_values.len() % (10 * BATCH_SIZE) == 0 {
 					let ratio: f64 = key_values.len() as f64 / keys_count as f64;
-					println!( // TODO: figure out how to get logs from remote in test cases
-						"progress = {:.2} [{} / {}]",
-						ratio,
-						key_values.len(),
-						keys_count,
-					);
 					debug!(
 						target: LOG_TARGET,
 						"progress = {:.2} [{} / {}]",
@@ -367,12 +361,6 @@ impl<B: BlockT> Builder<B> {
 			for f in config.modules.iter() {
 				let hashed_prefix = StorageKey(twox_128(f.as_bytes()).to_vec());
 				let module_kv = self.rpc_get_pairs_paged(hashed_prefix.clone(), at).await?;
-				println!(
-					"downloaded data for module {} (count: {} / prefix: {:?}).",
-					f,
-					module_kv.len(),
-					HexDisplay::from(&hashed_prefix)
-				);
 				info!(
 					target: LOG_TARGET,
 					"downloaded data for module {} (count: {} / prefix: {:?}).",