diff --git a/substrate/frame/core-fellowship/src/lib.rs b/substrate/frame/core-fellowship/src/lib.rs index 3f6683e23ae92efba8439b08c5cd207ed534b4d7..e3924594321aa60c69efbdb6df61ee9f0b488205 100644 --- a/substrate/frame/core-fellowship/src/lib.rs +++ b/substrate/frame/core-fellowship/src/lib.rs @@ -639,6 +639,6 @@ impl<T: Config<I>, I: 'static> pallet_ranked_collective::BenchmarkSetup<<T as frame_system::Config>::AccountId> for Pallet<T, I> { fn ensure_member(who: &<T as frame_system::Config>::AccountId) { - Self::induct(frame_system::RawOrigin::Root.into(), who.clone()).unwrap(); + Self::import(frame_system::RawOrigin::Signed(who.clone()).into()).unwrap(); } } diff --git a/substrate/frame/ranked-collective/src/benchmarking.rs b/substrate/frame/ranked-collective/src/benchmarking.rs index 79c664971168bd0a02a8c70890e9fecb392506c0..332d8292e53f1c8bd936a3fd19e9bd59f52d884b 100644 --- a/substrate/frame/ranked-collective/src/benchmarking.rs +++ b/substrate/frame/ranked-collective/src/benchmarking.rs @@ -33,6 +33,10 @@ fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>:: frame_system::Pallet::<T>::assert_last_event(generic_event.into()); } +fn assert_has_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::RuntimeEvent) { + frame_system::Pallet::<T>::assert_has_event(generic_event.into()); +} + fn make_member<T: Config<I>, I: 'static>(rank: Rank) -> T::AccountId { let who = account::<T::AccountId>("member", MemberCount::<T, I>::get(0), SEED); let who_lookup = T::Lookup::unlookup(who.clone()); @@ -186,7 +190,7 @@ benchmarks_instance_pallet! { verify { assert_eq!(Members::<T, I>::get(&new_who).unwrap().rank, 1); assert_eq!(Members::<T, I>::get(&who), None); - assert_last_event::<T, I>(Event::MemberExchanged { who, new_who }.into()); + assert_has_event::<T, I>(Event::MemberExchanged { who, new_who }.into()); } impl_benchmark_test_suite!(RankedCollective, crate::tests::new_test_ext(), crate::tests::Test);