From 9b0dddcb679b191f346787a630868cb383da7e0c Mon Sep 17 00:00:00 2001
From: bgallois <benjamin@gallois.cc>
Date: Fri, 8 Dec 2023 15:19:54 +0100
Subject: [PATCH] fix weight for handlers
---
pallets/authority-members/src/lib.rs | 2 +-
pallets/authority-members/src/traits.rs | 13 ++++---------
pallets/distance/src/lib.rs | 3 +--
runtime/common/src/handlers.rs | 8 +++-----
4 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/pallets/authority-members/src/lib.rs b/pallets/authority-members/src/lib.rs
index 3dbe5e113..355eb1ff7 100644
--- a/pallets/authority-members/src/lib.rs
+++ b/pallets/authority-members/src/lib.rs
@@ -405,7 +405,7 @@ pub mod pallet {
// Emit event
Self::deposit_event(Event::MemberRemoved { member: member_id });
- let _ = T::OnRemovedMember::on_removed_member(member_id);
+ T::OnRemovedMember::on_removed_member(member_id);
}
/// perform incoming authorities insertion
fn insert_in(member_id: T::MemberId) -> bool {
diff --git a/pallets/authority-members/src/traits.rs b/pallets/authority-members/src/traits.rs
index 3cd7566d9..81f36396e 100644
--- a/pallets/authority-members/src/traits.rs
+++ b/pallets/authority-members/src/traits.rs
@@ -15,24 +15,19 @@
// along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>.
use super::SessionIndex;
-use frame_support::pallet_prelude::Weight;
pub trait OnNewSession {
- fn on_new_session(index: SessionIndex) -> Weight;
+ fn on_new_session(index: SessionIndex);
}
impl OnNewSession for () {
- fn on_new_session(_: SessionIndex) -> Weight {
- Weight::zero()
- }
+ fn on_new_session(_: SessionIndex) {}
}
pub trait OnRemovedMember<MemberId> {
- fn on_removed_member(member_id: MemberId) -> Weight;
+ fn on_removed_member(member_id: MemberId);
}
impl<MemberId> OnRemovedMember<MemberId> for () {
- fn on_removed_member(_: MemberId) -> Weight {
- Weight::zero()
- }
+ fn on_removed_member(_: MemberId) {}
}
diff --git a/pallets/distance/src/lib.rs b/pallets/distance/src/lib.rs
index 62a33b4fa..0a13a751c 100644
--- a/pallets/distance/src/lib.rs
+++ b/pallets/distance/src/lib.rs
@@ -461,7 +461,7 @@ pub mod pallet {
}
impl<T: Config> pallet_authority_members::OnNewSession for Pallet<T> {
- fn on_new_session(index: SessionIndex) -> Weight {
+ fn on_new_session(index: SessionIndex) {
EvaluationBlock::<T>::set(frame_system::Pallet::<T>::parent_hash());
// Make results expire
@@ -505,7 +505,6 @@ pub mod pallet {
);
}
}
- Weight::zero()
}
}
diff --git a/runtime/common/src/handlers.rs b/runtime/common/src/handlers.rs
index 194a9f3ac..a0a084988 100644
--- a/runtime/common/src/handlers.rs
+++ b/runtime/common/src/handlers.rs
@@ -29,9 +29,9 @@ impl<Runtime> pallet_authority_members::traits::OnNewSession for OnNewSessionHan
where
Runtime: pallet_provide_randomness::Config + pallet_distance::Config,
{
- fn on_new_session(index: sp_staking::SessionIndex) -> Weight {
+ fn on_new_session(index: sp_staking::SessionIndex) {
pallet_provide_randomness::Pallet::<Runtime>::on_new_epoch();
- pallet_distance::Pallet::<Runtime>::on_new_session(index)
+ pallet_distance::Pallet::<Runtime>::on_new_session(index);
}
}
@@ -154,11 +154,9 @@ impl<Runtime> pallet_authority_members::traits::OnRemovedMember<IdtyIndex>
where
Runtime: frame_system::Config + pallet_membership::Config<Instance2, IdtyId = IdtyIndex>,
{
- fn on_removed_member(idty_index: IdtyIndex) -> Weight {
+ fn on_removed_member(idty_index: IdtyIndex) {
// TODO investigate why we should remove smith membership when removing authority member
pallet_membership::Pallet::<Runtime, Instance2>::force_revoke_membership(idty_index);
- // TODO investigate why weight zero
- Weight::zero()
}
}
--
GitLab