diff --git a/pallets/membership/src/benchmarking.rs b/pallets/membership/src/benchmarking.rs index 48849bd51e2adee83a09740d3ed6143478cfdd9d..047760709778967ff26b24dff4304ef1c9b33495 100644 --- a/pallets/membership/src/benchmarking.rs +++ b/pallets/membership/src/benchmarking.rs @@ -44,7 +44,7 @@ benchmarks_instance_pallet! { Membership::<T, I>::take(idty); let caller: T::AccountId = T::AccountIdOf::convert(idty.clone()).unwrap(); let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into(); - T::BenchmarkSetupHandler::force_status_ok(&idty, &caller); + T::BenchmarkSetupHandler::force_valid_distance_status(&idty); }: _<T::RuntimeOrigin>(caller_origin) verify { assert_has_event::<T, I>(Event::<T, I>::MembershipAdded{member: idty, expire_on: BlockNumberFor::<T>::one() + T::MembershipPeriod::get()}.into()); @@ -55,7 +55,7 @@ benchmarks_instance_pallet! { let idty: T::IdtyId = 3.into(); let caller: T::AccountId = T::AccountIdOf::convert(idty.clone()).unwrap(); let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into(); - T::BenchmarkSetupHandler::force_status_ok(&idty, &caller); + T::BenchmarkSetupHandler::force_valid_distance_status(&idty); }: _<T::RuntimeOrigin>(caller_origin) verify { assert_has_event::<T, I>(Event::<T, I>::MembershipAdded{member: idty, expire_on: BlockNumberFor::<T>::one() + T::MembershipPeriod::get()}.into()); diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs index 73b2cc5cb000338a53184b50366e1e152df3800a..f961d9fb99a677b1ae3a36168e63d9929f66684b 100644 --- a/pallets/membership/src/lib.rs +++ b/pallets/membership/src/lib.rs @@ -44,13 +44,13 @@ use std::collections::BTreeMap; #[cfg(feature = "runtime-benchmarks")] pub trait SetupBenchmark<IdtyId, AccountId> { - fn force_status_ok(idty_index: &IdtyId, account: &AccountId) -> (); + fn force_valid_distance_status(idty_index: &IdtyId) -> (); fn add_cert(_issuer: &IdtyId, _receiver: &IdtyId) -> (); } #[cfg(feature = "runtime-benchmarks")] impl<IdtyId, AccountId> SetupBenchmark<IdtyId, AccountId> for () { - fn force_status_ok(_idty_id: &IdtyId, _account: &AccountId) -> () {} + fn force_valid_distance_status(_idty_id: &IdtyId) -> () {} fn add_cert(_issuer: &IdtyId, _receiver: &IdtyId) -> () {} } diff --git a/runtime/common/src/providers.rs b/runtime/common/src/providers.rs index e3a3d334231c5951de869f6b0137989f12a236b8..b1ed3d7e94d3a491c3cdca8c51d10c8cb0f82afe 100644 --- a/runtime/common/src/providers.rs +++ b/runtime/common/src/providers.rs @@ -141,9 +141,8 @@ macro_rules! impl_benchmark_setup_handler { T: pallet_certification::Config<frame_support::instances::Instance1>, <T as pallet_certification::Config<frame_support::instances::Instance1>>::IdtyIndex: From<u32>, { - fn force_status_ok( + fn force_valid_distance_status( idty_id: &IdtyIndex, - account: &<T as frame_system::Config>::AccountId, ) -> () { let _ = pallet_distance::Pallet::<T>::do_valid_distance_status( *idty_id, None