Skip to content
Snippets Groups Projects
Unverified Commit c42e6e0a authored by bgallois's avatar bgallois
Browse files

simplify weight accounting

parent 91b9a13a
No related branches found
No related tags found
1 merge request!246Fix weight accounting
...@@ -293,20 +293,14 @@ pub mod pallet { ...@@ -293,20 +293,14 @@ pub mod pallet {
/// perform membership removal /// perform membership removal
pub fn do_remove_membership(idty_id: T::IdtyId, reason: MembershipRemovalReason) -> Weight { pub fn do_remove_membership(idty_id: T::IdtyId, reason: MembershipRemovalReason) -> Weight {
let mut weight = Weight::zero(); let mut weight = T::DbWeight::get().reads_writes(2, 3);
let mut add_db_reads_writes = |reads, writes| {
weight = weight.saturating_add(T::DbWeight::get().reads_writes(reads, writes));
};
if let Some(membership_data) = Membership::<T>::take(idty_id) { 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); Self::unschedule_membership_expiry(idty_id, membership_data.expire_on);
add_db_reads_writes(1, 2);
Self::deposit_event(Event::MembershipRemoved { Self::deposit_event(Event::MembershipRemoved {
member: idty_id, member: idty_id,
reason, reason,
}); });
weight = weight.saturating_add(T::OnRemoveMembership::on_removed(&idty_id)); weight += T::OnRemoveMembership::on_removed(&idty_id);
} }
weight weight
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment