Skip to content
Snippets Groups Projects
Commit d5988b93 authored by Benjamin Gallois's avatar Benjamin Gallois Committed by Hugo Trentesaux
Browse files

Fix weight for handlers (!212)

* fix weight for handlers
parent 00985037
No related branches found
No related tags found
1 merge request!212Fix weight for handlers
Pipeline #34721 passed
...@@ -405,7 +405,7 @@ pub mod pallet { ...@@ -405,7 +405,7 @@ pub mod pallet {
// Emit event // Emit event
Self::deposit_event(Event::MemberRemoved { member: member_id }); 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 /// perform incoming authorities insertion
fn insert_in(member_id: T::MemberId) -> bool { fn insert_in(member_id: T::MemberId) -> bool {
......
...@@ -15,24 +15,19 @@ ...@@ -15,24 +15,19 @@
// along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>. // along with Duniter-v2S. If not, see <https://www.gnu.org/licenses/>.
use super::SessionIndex; use super::SessionIndex;
use frame_support::pallet_prelude::Weight;
pub trait OnNewSession { pub trait OnNewSession {
fn on_new_session(index: SessionIndex) -> Weight; fn on_new_session(index: SessionIndex);
} }
impl OnNewSession for () { impl OnNewSession for () {
fn on_new_session(_: SessionIndex) -> Weight { fn on_new_session(_: SessionIndex) {}
Weight::zero()
}
} }
pub trait OnRemovedMember<MemberId> { pub trait OnRemovedMember<MemberId> {
fn on_removed_member(member_id: MemberId) -> Weight; fn on_removed_member(member_id: MemberId);
} }
impl<MemberId> OnRemovedMember<MemberId> for () { impl<MemberId> OnRemovedMember<MemberId> for () {
fn on_removed_member(_: MemberId) -> Weight { fn on_removed_member(_: MemberId) {}
Weight::zero()
}
} }
...@@ -461,7 +461,7 @@ pub mod pallet { ...@@ -461,7 +461,7 @@ pub mod pallet {
} }
impl<T: Config> pallet_authority_members::OnNewSession for Pallet<T> { 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()); EvaluationBlock::<T>::set(frame_system::Pallet::<T>::parent_hash());
// Make results expire // Make results expire
...@@ -505,7 +505,6 @@ pub mod pallet { ...@@ -505,7 +505,6 @@ pub mod pallet {
); );
} }
} }
Weight::zero()
} }
} }
......
...@@ -29,9 +29,9 @@ impl<Runtime> pallet_authority_members::traits::OnNewSession for OnNewSessionHan ...@@ -29,9 +29,9 @@ impl<Runtime> pallet_authority_members::traits::OnNewSession for OnNewSessionHan
where where
Runtime: pallet_provide_randomness::Config + pallet_distance::Config, 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_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> ...@@ -154,11 +154,9 @@ impl<Runtime> pallet_authority_members::traits::OnRemovedMember<IdtyIndex>
where where
Runtime: frame_system::Config + pallet_membership::Config<Instance2, IdtyId = IdtyIndex>, 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 // TODO investigate why we should remove smith membership when removing authority member
pallet_membership::Pallet::<Runtime, Instance2>::force_revoke_membership(idty_index); pallet_membership::Pallet::<Runtime, Instance2>::force_revoke_membership(idty_index);
// TODO investigate why weight zero
Weight::zero()
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment