Fix CI

substrate/frame/membership/src/benchmarking.rs

@@ -54,7 +54,7 @@ benchmarks_instance_pallet! {
 		));
 	} verify {
 		assert!(Members::<T, I>::get().contains(&new_member));
-		#[cfg(test)] crate::tests::clean();
+		#[cfg(test)] crate::mock::clean();
 	}
 
 	// the case of no prime or the prime being removed is surely cheaper than the case of
@@ -76,7 +76,7 @@ benchmarks_instance_pallet! {
 		assert!(!Members::<T, I>::get().contains(&to_remove));
 		// prime is rejigged
 		assert!(Prime::<T, I>::get().is_some() && T::MembershipChanged::get_prime().is_some());
-		#[cfg(test)] crate::tests::clean();
+		#[cfg(test)] crate::mock::clean();
 	}
 
 	// we remove a non-prime to make sure it needs to be set again.
@@ -100,7 +100,7 @@ benchmarks_instance_pallet! {
 		assert!(Members::<T, I>::get().contains(&add));
 		// prime is rejigged
 		assert!(Prime::<T, I>::get().is_some() && T::MembershipChanged::get_prime().is_some());
-		#[cfg(test)] crate::tests::clean();
+		#[cfg(test)] crate::mock::clean();
 	}
 
 	// er keep the prime common between incoming and outgoing to make sure it is rejigged.
@@ -120,7 +120,7 @@ benchmarks_instance_pallet! {
 		assert_eq!(Members::<T, I>::get(), new_members);
 		// prime is rejigged
 		assert!(Prime::<T, I>::get().is_some() && T::MembershipChanged::get_prime().is_some());
-		#[cfg(test)] crate::tests::clean();
+		#[cfg(test)] crate::mock::clean();
 	}
 
 	change_key {
@@ -141,7 +141,7 @@ benchmarks_instance_pallet! {
 		assert!(Members::<T, I>::get().contains(&add));
 		// prime is rejigged
 		assert_eq!(Prime::<T, I>::get().unwrap(), add);
-		#[cfg(test)] crate::tests::clean();
+		#[cfg(test)] crate::mock::clean();
 	}
 
 	set_prime {
@@ -158,7 +158,7 @@ benchmarks_instance_pallet! {
 	} verify {
 		assert!(Prime::<T, I>::get().is_some());
 		assert!(<T::MembershipChanged>::get_prime().is_some());
-		#[cfg(test)] crate::tests::clean();
+		#[cfg(test)] crate::mock::clean();
 	}
 
 	clear_prime {
@@ -172,8 +172,8 @@ benchmarks_instance_pallet! {
 	} verify {
 		assert!(Prime::<T, I>::get().is_none());
 		assert!(<T::MembershipChanged>::get_prime().is_none());
-		#[cfg(test)] crate::tests::clean();
+		#[cfg(test)] crate::mock::clean();
 	}
 
-	impl_benchmark_test_suite!(Membership, crate::tests::new_bench_ext(), crate::tests::Test);
+	impl_benchmark_test_suite!(Membership, crate::mock::new_bench_ext(), crate::mock::Test);
 }

substrate/frame/membership/src/tests.rs

@@ -17,107 +17,12 @@
 
 //! Tests for the module.
 
-use super::*;
 use crate as pallet_membership;
+use crate::{mock::*, *};
 
 use sp_runtime::{bounded_vec, traits::BadOrigin, BuildStorage};
 
-use frame_support::{
-	assert_noop, assert_ok, assert_storage_noop, derive_impl, ord_parameter_types, parameter_types,
-	traits::{ConstU32, StorageVersion},
-};
-use frame_system::EnsureSignedBy;
-
-type Block = frame_system::mocking::MockBlock<Test>;
-
-frame_support::construct_runtime!(
-	pub enum Test
-	{
-		System: frame_system,
-		Membership: pallet_membership,
-	}
-);
-
-parameter_types! {
-	pub static Members: Vec<u64> = vec![];
-	pub static Prime: Option<u64> = None;
-}
-
-#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
-impl frame_system::Config for Test {
-	type Block = Block;
-}
-ord_parameter_types! {
-	pub const One: u64 = 1;
-	pub const Two: u64 = 2;
-	pub const Three: u64 = 3;
-	pub const Four: u64 = 4;
-	pub const Five: u64 = 5;
-}
-
-pub struct TestChangeMembers;
-impl ChangeMembers<u64> for TestChangeMembers {
-	fn change_members_sorted(incoming: &[u64], outgoing: &[u64], new: &[u64]) {
-		let mut old_plus_incoming = Members::get();
-		old_plus_incoming.extend_from_slice(incoming);
-		old_plus_incoming.sort();
-		let mut new_plus_outgoing = new.to_vec();
-		new_plus_outgoing.extend_from_slice(outgoing);
-		new_plus_outgoing.sort();
-		assert_eq!(old_plus_incoming, new_plus_outgoing);
-
-		Members::set(new.to_vec());
-		Prime::set(None);
-	}
-	fn set_prime(who: Option<u64>) {
-		Prime::set(who);
-	}
-	fn get_prime() -> Option<u64> {
-		Prime::get()
-	}
-}
-
-impl InitializeMembers<u64> for TestChangeMembers {
-	fn initialize_members(members: &[u64]) {
-		MEMBERS.with(|m| *m.borrow_mut() = members.to_vec());
-	}
-}
-
-impl Config for Test {
-	type RuntimeEvent = RuntimeEvent;
-	type AddOrigin = EnsureSignedBy<One, u64>;
-	type RemoveOrigin = EnsureSignedBy<Two, u64>;
-	type SwapOrigin = EnsureSignedBy<Three, u64>;
-	type ResetOrigin = EnsureSignedBy<Four, u64>;
-	type PrimeOrigin = EnsureSignedBy<Five, u64>;
-	type MembershipInitialized = TestChangeMembers;
-	type MembershipChanged = TestChangeMembers;
-	type MaxMembers = ConstU32<10>;
-	type WeightInfo = ();
-}
-
-pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
-	let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
-	// We use default for brevity, but you can configure as desired if needed.
-	pallet_membership::GenesisConfig::<Test> {
-		members: bounded_vec![10, 20, 30],
-		..Default::default()
-	}
-	.assimilate_storage(&mut t)
-	.unwrap();
-	t.into()
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-pub(crate) fn new_bench_ext() -> sp_io::TestExternalities {
-	frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-pub(crate) fn clean() {
-	Members::set(vec![]);
-	Prime::set(None);
-}
+use frame_support::{assert_noop, assert_ok, assert_storage_noop, traits::StorageVersion};
 
 #[test]
 fn query_membership_works() {