From 82c8c53fd5cbcbea4f9377e60b50a8f5735b04cf Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo@trentesaux.fr>
Date: Wed, 20 Dec 2023 12:47:34 +0100
Subject: [PATCH] update distance setup handler
---
pallets/membership/src/benchmarking.rs | 4 ++--
pallets/membership/src/lib.rs | 4 ++--
runtime/common/src/providers.rs | 3 +--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/pallets/membership/src/benchmarking.rs b/pallets/membership/src/benchmarking.rs
index d07f4661b..89263f8b2 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 435d6b42d..99f9a317a 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 df5b31e9e..e45788bfe 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
--
GitLab