fix tests

pallets/certification/src/benchmarking.rs

@@ -72,6 +72,7 @@ benchmarks! {
         let receiver_cert: u32 = StorageIdtyCertMeta::<T>::get(receiver).received_count;
         frame_system::pallet::Pallet::<T>::set_block_number(T::CertPeriod::get());
         Pallet::<T>::add_cert(caller_origin.clone(), receiver)?;
+        frame_system::pallet::Pallet::<T>::set_block_number(T::CertPeriod::get() + T::CertPeriod::get());
     }: _<T::RuntimeOrigin>(caller_origin, receiver)
     verify {
         assert_has_event::<T>(Event::<T>::CertAdded{ issuer, receiver }.into());
@@ -80,13 +81,14 @@ benchmarks! {
     del_cert {
         let issuer: T::IdtyIndex = 1.into();
         let receiver: T::IdtyIndex = 0.into();
-        Pallet::<T>::do_add_cert_checked(issuer, receiver, false)?;
+        // Pallet::<T>::do_add_cert_checked(issuer, receiver, false)?;
         let receiver_cert: u32 = StorageIdtyCertMeta::<T>::get(receiver).received_count;
         let issuer_cert: u32 = StorageIdtyCertMeta::<T>::get(issuer).issued_count;
     }: _<T::RuntimeOrigin>(RawOrigin::Root.into(), issuer, receiver)
     verify {
         assert_has_event::<T>(Event::<T>::CertRemoved{ issuer,  receiver, expiration: false }.into());
     }
+
     remove_all_certs_received_by {
         let receiver: T::IdtyIndex = 0.into();
         let i in 2..1000 => add_certs::<T>(i, receiver)?;
@@ -94,14 +96,18 @@ benchmarks! {
     verify {
         assert!(CertsByReceiver::<T>::get(receiver).is_empty() );
     }
+
     on_initialize {
         assert!(CertsRemovableOn::<T>::try_get(T::BlockNumber::zero()).is_err());
     }: {Pallet::<T>::on_initialize(T::BlockNumber::zero());}
+
     do_remove_cert_noop {
     }: {Pallet::<T>::do_remove_cert(100.into(), 101.into(), Some(T::BlockNumber::zero()));}
+
     do_remove_cert {
         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)?;
         let issuer_cert: u32 = StorageIdtyCertMeta::<T>::get(issuer).issued_count;
         let receiver_cert: u32 = StorageIdtyCertMeta::<T>::get(receiver).received_count;

pallets/certification/src/lib.rs

@@ -456,6 +456,7 @@ pub mod pallet {
 
         /// perform the certification removal
         /// if block number is given only remove cert if still set to expire at this block number
+        // this is used because cert expiry unscheduling is not done (#110)
         pub fn do_remove_cert(
             issuer: T::IdtyIndex,
             receiver: T::IdtyIndex,

pallets/certification/src/tests.rs

@@ -228,7 +228,7 @@ fn test_cert_renewal() {
         // renew certification from bob to alice
         // this certification should expire 10 blocks later (at block 12)
         assert_eq!(
-            DefaultCertification::add_cert(RuntimeOrigin::signed(1), 0),
+            DefaultCertification::renew_cert(RuntimeOrigin::signed(1), 0),
             Ok(().into())
         );
         System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRenewed {
@@ -270,7 +270,7 @@ fn test_cert_renewal_cert_delay() {
         run_to_block(2);
         // renew certification from bob to alice
         assert_eq!(
-            DefaultCertification::add_cert(RuntimeOrigin::signed(1), 0),
+            DefaultCertification::renew_cert(RuntimeOrigin::signed(1), 0),
             Ok(().into())
         );
         System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRenewed {
@@ -314,7 +314,7 @@ fn test_cert_renewal_expiration() {
         // renew certification from bob to alice
         // this certification should expire 10 blocks later (at block 12)
         assert_eq!(
-            DefaultCertification::add_cert(RuntimeOrigin::signed(1), 0),
+            DefaultCertification::renew_cert(RuntimeOrigin::signed(1), 0),
             Ok(().into())
         );
         System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRenewed {
@@ -326,7 +326,7 @@ fn test_cert_renewal_expiration() {
         // renew certification from bob to alice again
         // this certification should expire 10 blocks later (at block 14)
         assert_eq!(
-            DefaultCertification::add_cert(RuntimeOrigin::signed(1), 0),
+            DefaultCertification::renew_cert(RuntimeOrigin::signed(1), 0),
             Ok(().into())
         );
         System::assert_last_event(RuntimeEvent::DefaultCertification(Event::CertRenewed {