Do not run slow running try state tests in CI

frame/bags-list/src/lib.rs

@@ -98,6 +98,9 @@ pub mod pallet {
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
+	#[cfg(feature = "try-runtime")]
+	use frame_support::traits::TryStateSelect;
+
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(crate) trait Store)]
 	pub struct Pallet<T, I = ()>(_);
@@ -268,7 +271,7 @@ pub mod pallet {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn try_state(_: BlockNumberFor<T>) -> Result<(), &'static str> {
+		fn try_state(_: BlockNumberFor<T>, _: TryStateSelect) -> Result<(), &'static str> {
 			<Self as SortedListProvider<T::AccountId>>::try_state()
 		}
 	}

frame/executive/src/lib.rs

@@ -340,7 +340,7 @@ where
 			let _guard = frame_support::StorageNoopGuard::default();
 			<AllPalletsWithSystem as frame_support::traits::TryState<System::BlockNumber>>::try_state(
 				frame_system::Pallet::<System>::block_number(),
-				frame_try_runtime::TryStateSelect::All,
+				frame_try_runtime::TryStateSelect::Fast,
 			)?;
 		}
 
@@ -353,7 +353,7 @@ where
 			let _guard = frame_support::StorageNoopGuard::default();
 			<AllPalletsWithSystem as frame_support::traits::TryState<System::BlockNumber>>::try_state(
 				frame_system::Pallet::<System>::block_number(),
-				frame_try_runtime::TryStateSelect::All,
+				frame_try_runtime::TryStateSelect::Fast,
 			)?;
 		}
 

frame/fast-unstake/src/lib.rs

@@ -83,7 +83,7 @@ pub mod pallet {
 	use crate::types::*;
 	use frame_support::{
 		pallet_prelude::*,
-		traits::{Defensive, ReservableCurrency, StorageVersion},
+		traits::{Defensive, ReservableCurrency, StorageVersion, TryStateSelect},
 	};
 	use frame_system::pallet_prelude::*;
 	use sp_runtime::{traits::Zero, DispatchResult};
@@ -228,7 +228,7 @@ pub mod pallet {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn try_state(_n: T::BlockNumber) -> Result<(), &'static str> {
+		fn try_state(_n: T::BlockNumber, _: TryStateSelect) -> Result<(), &'static str> {
 			// ensure that the value of `ErasToCheckPerBlock` is less than
 			// `T::MaxErasToCheckPerBlock`.
 			assert!(

frame/nomination-pools/src/lib.rs

@@ -1169,7 +1169,7 @@ impl<T: Config> Get<u32> for TotalUnbondingPools<T> {
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::traits::StorageVersion;
+	use frame_support::traits::{StorageVersion, TryStateSelect};
 	use frame_system::{ensure_signed, pallet_prelude::*};
 
 	/// The current storage version.
@@ -2122,7 +2122,7 @@ pub mod pallet {
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
 		#[cfg(feature = "try-runtime")]
-		fn try_state(_n: BlockNumberFor<T>) -> Result<(), &'static str> {
+		fn try_state(_n: BlockNumberFor<T>, _: TryStateSelect) -> Result<(), &'static str> {
 			Self::do_try_state(u8::MAX)
 		}
 

frame/nomination-pools/src/migration.rs

@@ -22,6 +22,7 @@ use sp_std::{collections::btree_map::BTreeMap, vec::Vec};
 
 pub mod v1 {
 	use super::*;
+	use frame_support::traits::TryStateSelect;
 
 	#[derive(Decode)]
 	pub struct OldPoolRoles<AccountId> {
@@ -100,7 +101,7 @@ pub mod v1 {
 		fn post_upgrade(_: Vec<u8>) -> Result<(), &'static str> {
 			// new version must be set.
 			assert_eq!(Pallet::<T>::on_chain_storage_version(), 1);
-			Pallet::<T>::try_state(frame_system::Pallet::<T>::block_number())?;
+			Pallet::<T>::try_state(frame_system::Pallet::<T>::block_number(), TryStateSelect::All)?;
 			Ok(())
 		}
 	}

frame/staking/src/mock.rs

@@ -546,7 +546,7 @@ impl ExtBuilder {
 		let mut ext = self.build();
 		ext.execute_with(test);
 		ext.execute_with(|| {
-			Staking::do_try_state(System::block_number()).unwrap();
+			Staking::do_try_state(System::block_number(), false).unwrap();
 		});
 	}
 }

frame/staking/src/pallet/impls.rs

@@ -1668,19 +1668,35 @@ impl<T: Config> StakingInterface for Pallet<T> {
 	}
 }
 
+#[cfg(any(test, feature = "try-runtime"))]
+#[derive(PartialEq)]
+pub(crate) enum TestMode {
+	// run only fast running tests
+	Fast,
+	// run all the tests
+	All,
+}
+
 #[cfg(any(test, feature = "try-runtime"))]
 impl<T: Config> Pallet<T> {
-	pub(crate) fn do_try_state(_: BlockNumberFor<T>) -> Result<(), &'static str> {
+	pub(crate) fn do_try_state(_: BlockNumberFor<T>, fast_mode: bool) -> Result<(), &'static str> {
+		// fast tests
 		ensure!(
 			T::VoterList::iter()
 				.all(|x| <Nominators<T>>::contains_key(&x) || <Validators<T>>::contains_key(&x)),
 			"VoterList contains non-staker"
 		);
 
-		Self::check_nominators()?;
 		Self::check_exposures()?;
 		Self::check_ledgers()?;
-		Self::check_count()
+		Self::check_count()?;
+
+		if !fast_mode {
+			// slow running tests (should be avoided on CI)
+			Self::check_nominators()?;
+		}
+
+		Ok(())
 	}
 
 	fn check_count() -> Result<(), &'static str> {

frame/staking/src/pallet/mod.rs

@@ -59,6 +59,7 @@ pub(crate) const SPECULATIVE_NUM_SPANS: u32 = 32;
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_election_provider_support::ElectionDataProvider;
+	use frame_support::traits::TryStateSelect;
 
 	use crate::BenchmarkingConfig;
 
@@ -825,8 +826,8 @@ pub mod pallet {
 		}
 
 		#[cfg(feature = "try-runtime")]
-		fn try_state(n: BlockNumberFor<T>) -> Result<(), &'static str> {
-			Self::do_try_state(n)
+		fn try_state(n: BlockNumberFor<T>, select: TryStateSelect) -> Result<(), &'static str> {
+			Self::do_try_state(n, select == TryStateSelect::Fast)
 		}
 	}
 

frame/support/procedural/src/pallet/expand/hooks.rs

@@ -214,14 +214,14 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 		{
 			fn try_state(
 				n: <T as #frame_system::Config>::BlockNumber,
-				_s: #frame_support::traits::TryStateSelect
+				s: #frame_support::traits::TryStateSelect
 			) -> Result<(), &'static str> {
 				#log_try_state
 				<
 					Self as #frame_support::traits::Hooks<
 						<T as #frame_system::Config>::BlockNumber
 					>
-				>::try_state(n)
+				>::try_state(n, s)
 			}
 		}
 	)

frame/support/src/traits/hooks.rs

@@ -17,6 +17,8 @@
 
 //! Traits for hooking tasks to events in a blockchain's lifecycle.
 
+#[cfg(feature = "try-runtime")]
+use super::try_runtime::Select as TryStateSelect;
 use crate::weights::Weight;
 use impl_trait_for_tuples::impl_for_tuples;
 use sp_runtime::traits::AtLeast32BitUnsigned;
@@ -272,7 +274,7 @@ pub trait Hooks<BlockNumber> {
 	///
 	/// This hook should not alter any storage.
 	#[cfg(feature = "try-runtime")]
-	fn try_state(_n: BlockNumber) -> Result<(), &'static str> {
+	fn try_state(_n: BlockNumber, _s: TryStateSelect) -> Result<(), &'static str> {
 		Ok(())
 	}
 

frame/support/src/traits/try_runtime.rs

@@ -22,7 +22,7 @@ use sp_arithmetic::traits::AtLeast32BitUnsigned;
 use sp_std::prelude::*;
 
 /// Which state tests to execute.
-#[derive(codec::Encode, codec::Decode, Clone)]
+#[derive(codec::Encode, codec::Decode, Clone, Eq, PartialEq)]
 pub enum Select {
 	/// None of them.
 	None,
@@ -34,6 +34,10 @@ pub enum Select {
 	///
 	/// Pallet names are obtained from [`super::PalletInfoAccess`].
 	Only(Vec<Vec<u8>>),
+	/// Run only fast running tests.
+	///
+	/// Optimal mode for CI. Avoids long running tests.
+	Fast,
 }
 
 impl Default for Select {
@@ -55,6 +59,7 @@ impl sp_std::fmt::Debug for Select {
 			),
 			Select::All => write!(f, "All"),
 			Select::None => write!(f, "None"),
+			Select::Fast => write!(f, "Fast"),
 		}
 	}
 }
@@ -63,9 +68,10 @@ impl sp_std::fmt::Debug for Select {
 impl sp_std::str::FromStr for Select {
 	type Err = &'static str;
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		match s {
-			"all" | "All" => Ok(Select::All),
-			"none" | "None" => Ok(Select::None),
+		match s.to_lowercase().as_ref() {
+			"fast" => Ok(Select::Fast),
+			"all" => Ok(Select::All),
+			"none" => Ok(Select::None),
 			_ =>
 				if s.starts_with("rr-") {
 					let count = s
@@ -142,7 +148,7 @@ impl<BlockNumber: Clone + sp_std::fmt::Debug + AtLeast32BitUnsigned> TryState<Bl
 	fn try_state(n: BlockNumber, targets: Select) -> Result<(), &'static str> {
 		match targets {
 			Select::None => Ok(()),
-			Select::All => {
+			Select::All | Select::Fast => {
 				let mut result = Ok(());
 				for_tuples!( #( result = result.and(Tuple::try_state(n.clone(), targets.clone())); )* );
 				result

utils/frame/try-runtime/cli/src/commands/execute_block.rs

@@ -39,6 +39,7 @@ pub struct ExecuteBlockCmd {
 	///
 	/// Expected values:
 	/// - `all`
+	/// - `fast`
 	/// - `none`
 	/// - A comma separated list of pallets, as per pallet names in `construct_runtime!()` (e.g.
 	///   `Staking, System`).

utils/frame/try-runtime/cli/src/commands/follow_chain.rs

@@ -48,6 +48,7 @@ pub struct FollowChainCmd {
 	///
 	/// Expected values:
 	/// - `all`
+	/// - `fast`
 	/// - `none`
 	/// - A comma separated list of pallets, as per pallet names in `construct_runtime!()` (e.g.
 	///   `Staking, System`).