refac(#173): harmonize *MembershipAdded and *MembershipRemoved

pallets/smith-members/src/lib.rs

@@ -146,9 +146,9 @@ pub mod pallet {
             issuer: T::IdtyIndex,
         },
         /// A smith gathered enough certifications to become an authority (can call `go_online()`).
-        PromotedToSmith { idty_index: T::IdtyIndex },
+        SmithMembershipAdded { idty_index: T::IdtyIndex },
         /// A smith has been removed from the smiths set.
-        SmithExcluded { idty_index: T::IdtyIndex },
+        SmithMembershipRemoved { idty_index: T::IdtyIndex },
     }
 
     #[pallet::genesis_config]
@@ -455,7 +455,7 @@ impl<T: Config> Pallet<T> {
                 smith_meta.expires_on = Some(new_expires_on);
                 Self::deposit_event(Event::<T>::SmithCertAdded { receiver, issuer });
                 if smith_meta.status == SmithStatus::Smith {
-                    Self::deposit_event(Event::<T>::PromotedToSmith {
+                    Self::deposit_event(Event::<T>::SmithMembershipAdded {
                         idty_index: receiver,
                     });
                 }
@@ -513,7 +513,7 @@ impl<T: Config> Pallet<T> {
         }
         // Deletion done: notify (authority-members) for cascading
         T::OnSmithDelete::on_smith_delete(receiver, reason);
-        Self::deposit_event(Event::<T>::SmithExcluded {
+        Self::deposit_event(Event::<T>::SmithMembershipRemoved {
             idty_index: receiver,
         });
     }

pallets/smith-members/src/tests.rs

@@ -93,9 +93,9 @@ fn process_to_become_a_smith_and_lose_it() {
             receiver: 5,
             issuer: 1,
         }));
-        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::PromotedToSmith {
-            idty_index: 5,
-        }));
+        System::assert_has_event(RuntimeEvent::Smith(
+            Event::<Runtime>::SmithMembershipAdded { idty_index: 5 },
+        ));
         assert_eq!(
             Smiths::<Runtime>::get(5).unwrap(),
             SmithMeta {
@@ -116,9 +116,9 @@ fn process_to_become_a_smith_and_lose_it() {
         assert!(Smiths::<Runtime>::get(5).is_some());
         // On session 5 no more smiths because of lack of activity
         Pallet::<Runtime>::on_new_session(5);
-        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithExcluded {
-            idty_index: 1,
-        }));
+        System::assert_has_event(RuntimeEvent::Smith(
+            Event::<Runtime>::SmithMembershipRemoved { idty_index: 1 },
+        ));
         System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
             receiver: 1,
             issuer: 2,
@@ -131,9 +131,9 @@ fn process_to_become_a_smith_and_lose_it() {
             receiver: 1,
             issuer: 4,
         }));
-        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithExcluded {
-            idty_index: 2,
-        }));
+        System::assert_has_event(RuntimeEvent::Smith(
+            Event::<Runtime>::SmithMembershipRemoved { idty_index: 2 },
+        ));
         System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
             receiver: 2,
             issuer: 3,
@@ -142,9 +142,9 @@ fn process_to_become_a_smith_and_lose_it() {
             receiver: 2,
             issuer: 4,
         }));
-        System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithExcluded {
-            idty_index: 5,
-        }));
+        System::assert_has_event(RuntimeEvent::Smith(
+            Event::<Runtime>::SmithMembershipRemoved { idty_index: 5 },
+        ));
         System::assert_has_event(RuntimeEvent::Smith(Event::<Runtime>::SmithCertRemoved {
             receiver: 1,
             issuer: 3,

runtime/gdev/tests/integration_tests.rs

@@ -1540,7 +1540,7 @@ fn test_smith_member_can_revoke_its_idty() {
         ));
         // smith membership should be removed as well
         System::assert_has_event(RuntimeEvent::SmithMembers(
-            pallet_smith_members::Event::SmithExcluded { idty_index: 3 },
+            pallet_smith_members::Event::SmithMembershipRemoved { idty_index: 3 },
         ));
         System::assert_has_event(RuntimeEvent::SmithMembers(
             pallet_smith_members::Event::SmithCertRemoved {