Fix weight accounting

The problem is slightly different from the previously raised issue due to the deletion of instance pallets. Currently, the problem lies in having two tuple handlers (OnIdtyChange and Event). The weight of the function calling these handlers is the sum of each implementation. If these functions are not called in hooks, it will be possible to take the worst possible path as an approximation. However, some are called in on_initialize, and the worst case is close to 7% of a block, approximately 10 times the average path.

• Add weight return in OnIdtyChange and Event handlers.
• Account for the weight where these handlers are called.
• Replace all +=, -= by saturating_add and saturating_sub for consistency.
• Closes #163 (closed).
• Closes #203 (closed)

Note: Some handlers are difficult to benchmark using a benchmark function, so the accounting is performed by counting reads and writes, inspired by the staking pallet from Substrate.

Closes #167 (closed)

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
         }