diff --git a/pallets/membership/src/benchmarking.rs b/pallets/membership/src/benchmarking.rs index d07f4661b788592244c6d290103126cc5bac0192..89263f8b2dd0450fd8ae780c88385d49d07311bb 100644 --- a/pallets/membership/src/benchmarking.rs +++ b/pallets/membership/src/benchmarking.rs @@ -45,7 +45,7 @@ benchmarks_instance_pallet! { Membership::<T, I>::take(idty); let caller: T::AccountId = T::AccountIdOf::convert(idty).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()); @@ -56,7 +56,7 @@ benchmarks_instance_pallet! { let idty: T::IdtyId = 3.into(); let caller: T::AccountId = T::AccountIdOf::convert(idty).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 435d6b42d06e5db9d4134131d79d83b184d71ee4..99f9a317af73b19ff1fa545e0b029de266f9fcd3 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 df5b31e9ecfa13183eb09c2e3bb5776075590c10..e45788bfe78a9b466a70ff507f8da482d9c61ac9 100644 --- a/runtime/common/src/providers.rs +++ b/runtime/common/src/providers.rs @@ -104,9 +104,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