diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs index 06b127ed089f22cfe87f290cee2797be86e42b6c..afa6290d50e417db75f2a9d697a60c8b497cd0b9 100644 --- a/pallets/membership/src/lib.rs +++ b/pallets/membership/src/lib.rs @@ -293,20 +293,14 @@ pub mod pallet { /// perform membership removal pub fn do_remove_membership(idty_id: T::IdtyId, reason: MembershipRemovalReason) -> Weight { - let mut weight = Weight::zero(); - let mut add_db_reads_writes = |reads, writes| { - weight = weight.saturating_add(T::DbWeight::get().reads_writes(reads, writes)); - }; - + let mut weight = T::DbWeight::get().reads_writes(2, 3); if let Some(membership_data) = Membership::<T>::take(idty_id) { - add_db_reads_writes(1, 1); Self::unschedule_membership_expiry(idty_id, membership_data.expire_on); - add_db_reads_writes(1, 2); Self::deposit_event(Event::MembershipRemoved { member: idty_id, reason, }); - weight = weight.saturating_add(T::OnRemoveMembership::on_removed(&idty_id)); + weight += T::OnRemoveMembership::on_removed(&idty_id); } weight }