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/certification/src/benchmarking.rs

@@ -38,7 +38,7 @@ mod benchmarks {
     fn add_certs<T: Config>(i: u32, receiver: T::IdtyIndex) -> Result<(), &'static str> {
         Pallet::<T>::remove_all_certs_received_by(RawOrigin::Root.into(), receiver)?;
         for j in 1..i {
-            Pallet::<T>::do_add_cert_checked(j.into(), receiver, false);
+            Pallet::<T>::do_add_cert_checked(j.into(), receiver, false)?;
         }
         assert!(
             CertsByReceiver::<T>::get(receiver).len() as u32 == i - 1,
@@ -56,7 +56,7 @@ mod benchmarks {
 
         #[block]
         {
-            Pallet::<T>::do_add_cert_checked(issuer, receiver, true);
+            Pallet::<T>::do_add_cert_checked(issuer, receiver, true)?;
         }
 
         assert_has_event::<T>(Event::<T>::CertAdded { issuer, receiver }.into());
@@ -83,7 +83,8 @@ mod benchmarks {
         let issuer: T::IdtyIndex = 1.into();
         let caller: T::AccountId = T::IdtyAttr::owner_key(issuer).unwrap();
         let receiver: T::IdtyIndex = 2.into();
-        Pallet::<T>::del_cert(RawOrigin::Root.into(), issuer, receiver)?;
+        // Ignore the error if cert already exist
+        let _ = Pallet::<T>::del_cert(RawOrigin::Root.into(), issuer, receiver);
         frame_system::pallet::Pallet::<T>::set_block_number(T::CertPeriod::get());
         Pallet::<T>::add_cert(RawOrigin::Signed(caller.clone()).into(), receiver)?;
         frame_system::pallet::Pallet::<T>::set_block_number(
@@ -103,7 +104,7 @@ mod benchmarks {
         let receiver: T::IdtyIndex = 2.into();
         // try to add cert if missing, else ignore
         // this depends on initial data
-        Pallet::<T>::do_add_cert_checked(issuer, receiver, false);
+        Pallet::<T>::do_add_cert_checked(issuer, receiver, false)?;
 
         #[extrinsic_call]
         _(RawOrigin::Root, issuer, receiver);
@@ -150,11 +151,11 @@ mod benchmarks {
     }
 
     #[benchmark]
-    fn do_remove_cert() {
+    fn do_remove_cert() -> Result<(), BenchmarkError> {
         let issuer: T::IdtyIndex = 1.into();
         let receiver: T::IdtyIndex = 0.into();
         Pallet::<T>::do_remove_cert(issuer, receiver, None);
-        Pallet::<T>::do_add_cert_checked(issuer, receiver, false);
+        Pallet::<T>::do_add_cert_checked(issuer, receiver, false)?;
         let block_number = T::ValidityPeriod::get();
         frame_system::pallet::Pallet::<T>::set_block_number(block_number);
 
@@ -171,6 +172,7 @@ mod benchmarks {
             }
             .into(),
         );
+        Ok(())
     }
 
     impl_benchmark_test_suite!(