From 92fccb10be65c9cdddba4dd747812d672bf192ba Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Mon, 22 Jan 2024 12:54:47 +0100
Subject: [PATCH] refac(#173): harmonize *CertAdded and *CertRemoved

---
 pallets/smith-members/src/benchmarking.rs |   6 +-
 pallets/smith-members/src/lib.rs          |  35 ++++----
 pallets/smith-members/src/tests.rs        | 100 +++++++++-------------
 resources/metadata.scale                  | Bin 128457 -> 128703 bytes
 runtime/gdev/tests/integration_tests.rs   |  12 +--
 5 files changed, 66 insertions(+), 87 deletions(-)

diff --git a/pallets/smith-members/src/benchmarking.rs b/pallets/smith-members/src/benchmarking.rs
index 1721c39d5..d5a9d0a27 100644
--- a/pallets/smith-members/src/benchmarking.rs
+++ b/pallets/smith-members/src/benchmarking.rs
@@ -85,9 +85,9 @@ benchmarks! {
         let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
     }: _<T::RuntimeOrigin>(caller_origin, receiver)
     verify {
-        assert_has_event::<T>(Event::<T>::SmithCertificationAdded{
-            idty_index: receiver,
-            issued_by: issuer,
+        assert_has_event::<T>(Event::<T>::SmithCertAdded{
+            receiver,
+            issuer,
         }.into());
     }
 
diff --git a/pallets/smith-members/src/lib.rs b/pallets/smith-members/src/lib.rs
index 1c7742f8f..a4c214fb3 100644
--- a/pallets/smith-members/src/lib.rs
+++ b/pallets/smith-members/src/lib.rs
@@ -136,14 +136,14 @@ pub mod pallet {
         /// The invitation has been accepted.
         InvitationAccepted { idty_index: T::IdtyIndex },
         /// Certification received
-        SmithCertificationAdded {
-            idty_index: T::IdtyIndex,
-            issued_by: T::IdtyIndex,
+        SmithCertAdded {
+            receiver: T::IdtyIndex,
+            issuer: T::IdtyIndex,
         },
         /// Certification lost
-        SmithCertificationRemoved {
-            idty_index: T::IdtyIndex,
-            issued_by: T::IdtyIndex,
+        SmithCertRemoved {
+            receiver: T::IdtyIndex,
+            issuer: T::IdtyIndex,
         },
         /// A smith gathered enough certifications to become an authority (can call `go_online()`).
         PromotedToSmith { idty_index: T::IdtyIndex },
@@ -453,10 +453,7 @@ impl<T: Config> Pallet<T> {
                 let new_expires_on =
                     CurrentSession::<T>::get() + T::SmithInactivityMaxDuration::get();
                 smith_meta.expires_on = Some(new_expires_on);
-                Self::deposit_event(Event::<T>::SmithCertificationAdded {
-                    idty_index: receiver,
-                    issued_by: issuer,
-                });
+                Self::deposit_event(Event::<T>::SmithCertAdded { receiver, issuer });
                 if smith_meta.status == SmithStatus::Smith {
                     Self::deposit_event(Event::<T>::PromotedToSmith {
                         idty_index: receiver,
@@ -487,9 +484,9 @@ impl<T: Config> Pallet<T> {
         }
     }
 
-    fn _do_exclude_smith(idty_index: T::IdtyIndex, reason: SmithRemovalReason) {
+    fn _do_exclude_smith(receiver: T::IdtyIndex, reason: SmithRemovalReason) {
         let mut lost_certs = vec![];
-        Smiths::<T>::mutate(idty_index, |maybe_smith_meta| {
+        Smiths::<T>::mutate(receiver, |maybe_smith_meta| {
             if let Some(smith_meta) = maybe_smith_meta {
                 smith_meta.expires_on = None;
                 smith_meta.status = SmithStatus::Excluded;
@@ -504,19 +501,21 @@ impl<T: Config> Pallet<T> {
         for lost_cert_issuer in lost_certs {
             Smiths::<T>::mutate(lost_cert_issuer, |maybe_smith_meta| {
                 if let Some(smith_meta) = maybe_smith_meta {
-                    if let Ok(index) = smith_meta.issued_certs.binary_search(&idty_index) {
+                    if let Ok(index) = smith_meta.issued_certs.binary_search(&receiver) {
                         smith_meta.issued_certs.remove(index);
-                        Self::deposit_event(Event::<T>::SmithCertificationRemoved {
-                            idty_index,
-                            issued_by: lost_cert_issuer,
+                        Self::deposit_event(Event::<T>::SmithCertRemoved {
+                            receiver,
+                            issuer: lost_cert_issuer,
                         });
                     }
                 }
             });
         }
         // Deletion done: notify (authority-members) for cascading
-        T::OnSmithDelete::on_smith_delete(idty_index, reason);
-        Self::deposit_event(Event::<T>::SmithExcluded { idty_index });
+        T::OnSmithDelete::on_smith_delete(receiver, reason);
+        Self::deposit_event(Event::<T>::SmithExcluded {
+            idty_index: receiver,
+        });
     }
 
     pub fn on_smith_goes_online(idty_index: T::IdtyIndex) {
diff --git a/pallets/smith-members/src/tests.rs b/pallets/smith-members/src/tests.rs
index f9ec60242..99efa8bf6 100644
--- a/pallets/smith-members/src/tests.rs
+++ b/pallets/smith-members/src/tests.rs
@@ -71,12 +71,10 @@ fn process_to_become_a_smith_and_lose_it() {
             RuntimeOrigin::signed(1),
             5
         ));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationAdded {
-                idty_index: 5,
-                issued_by: 1,
-            },
-        ));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertAdded {
+            receiver: 5,
+            issuer: 1,
+        }));
         assert_eq!(
             Smiths::<Runtime>::get(5).unwrap(),
             SmithMeta {
@@ -91,12 +89,10 @@ fn process_to_become_a_smith_and_lose_it() {
             RuntimeOrigin::signed(2),
             5
         ));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationAdded {
-                idty_index: 5,
-                issued_by: 1,
-            },
-        ));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertAdded {
+            receiver: 5,
+            issuer: 1,
+        }));
         System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::PromotedToSmith {
             idty_index: 5,
         }));
@@ -123,60 +119,44 @@ fn process_to_become_a_smith_and_lose_it() {
         System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithExcluded {
             idty_index: 1,
         }));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationRemoved {
-                idty_index: 1,
-                issued_by: 2,
-            },
-        ));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationRemoved {
-                idty_index: 1,
-                issued_by: 3,
-            },
-        ));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationRemoved {
-                idty_index: 1,
-                issued_by: 4,
-            },
-        ));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
+            receiver: 1,
+            issuer: 2,
+        }));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
+            receiver: 1,
+            issuer: 3,
+        }));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
+            receiver: 1,
+            issuer: 4,
+        }));
         System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithExcluded {
             idty_index: 2,
         }));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationRemoved {
-                idty_index: 2,
-                issued_by: 3,
-            },
-        ));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationRemoved {
-                idty_index: 2,
-                issued_by: 4,
-            },
-        ));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
+            receiver: 2,
+            issuer: 3,
+        }));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
+            receiver: 2,
+            issuer: 4,
+        }));
         System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithExcluded {
             idty_index: 5,
         }));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationRemoved {
-                idty_index: 1,
-                issued_by: 3,
-            },
-        ));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationRemoved {
-                idty_index: 5,
-                issued_by: 1,
-            },
-        ));
-        System::assert_has_event(RuntimeEvent::Smith(
-            Event::<Runtime>::SmithCertificationRemoved {
-                idty_index: 5,
-                issued_by: 2,
-            },
-        ));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
+            receiver: 1,
+            issuer: 3,
+        }));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
+            receiver: 5,
+            issuer: 1,
+        }));
+        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
+            receiver: 5,
+            issuer: 2,
+        }));
         assert_eq!(
             Smiths::<Runtime>::get(1),
             Some(SmithMeta {
diff --git a/resources/metadata.scale b/resources/metadata.scale
index 820374cd2073ee49d2ba67359255742635e037a9..1db6c720cb1e51c1688823161d0edf73e9b837e6 100644
GIT binary patch
delta 330
zcmX^4ntlIU_6>b%j1rUk)y@l81m|X!WH_f5l{luPq^598zBf~9vcNTo$!pXlg&g3L
zL8-a<Wk}MZ%q$)tO_^z#$%!SI`FRRC`NbuZkE-i3vP}N0-pa_jxl*H{u%2a&XI@!m
zNvcAkLU?|NLT+kqQfiSxNxni!QKdpsYI1&VW?ni_5^Rx6Vsdh7K}mcjNDJ6h21b@M
zj$lEB#5@IrxPnG*X>o}{Mq*hi(3DiDRBDPsT4qskiKa<1*lCsVlO<*;da=kdLY!I&
zHw37%802q-@{G*n425K%;W?>^DGDVSsR|IinLs5#XM&vway{6AlQ;hGX>Oafy=@kw
Gb2I?@8hb4O

delta 113
zcmdo0mi^>w_6>b%j3Sf!)y@ltIHwksWTs^%CzfR9=LMxEr)Ew*;GoE*l383_nwk=y
zR5^Kqy5?jd4P8d&$qpK=j4YdvX*3jyF}NfqC#M#a#AoJ}WtM<7GcYnt-ZM)JNIK5-
OX|9>Qy=FF}b2I>^L@EjZ

diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs
index c912e5848..f1e12ec94 100644
--- a/runtime/gdev/tests/integration_tests.rs
+++ b/runtime/gdev/tests/integration_tests.rs
@@ -1543,15 +1543,15 @@ fn test_smith_member_can_revoke_its_idty() {
             pallet_smith_members::Event::SmithExcluded { idty_index: 3 },
         ));
         System::assert_has_event(RuntimeEvent::SmithMembers(
-            pallet_smith_members::Event::SmithCertificationRemoved {
-                idty_index: 3,
-                issued_by: 1,
+            pallet_smith_members::Event::SmithCertRemoved {
+                receiver: 3,
+                issuer: 1,
             },
         ));
         System::assert_has_event(RuntimeEvent::SmithMembers(
-            pallet_smith_members::Event::SmithCertificationRemoved {
-                idty_index: 3,
-                issued_by: 2,
+            pallet_smith_members::Event::SmithCertRemoved {
+                receiver: 3,
+                issuer: 2,
             },
         ));
         // Now Charlie is going out
-- 
GitLab