From fbce116a441a59b17e7f37550b0132cdcf9741cb Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Sat, 30 Jul 2022 11:41:43 +0200
Subject: [PATCH] Remove RevocationPeriod

---
 pallets/duniter-wot/src/mock.rs      |  4 ----
 pallets/membership/src/lib.rs        | 10 ----------
 pallets/membership/src/mock.rs       |  2 --
 runtime/common/src/pallets_config.rs |  6 ++----
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/pallets/duniter-wot/src/mock.rs b/pallets/duniter-wot/src/mock.rs
index 458c40d11..56d836673 100644
--- a/pallets/duniter-wot/src/mock.rs
+++ b/pallets/duniter-wot/src/mock.rs
@@ -139,7 +139,6 @@ impl pallet_identity::Config for Test {
 parameter_types! {
     pub const MembershipPeriod: u64 = 8;
     pub const PendingMembershipPeriod: u64 = 3;
-    pub const RevocationPeriod: u64 = 4;
 }
 
 impl pallet_membership::Config<Instance1> for Test {
@@ -153,7 +152,6 @@ impl pallet_membership::Config<Instance1> for Test {
     type MetaData = ();
     type OnEvent = DuniterWot;
     type PendingMembershipPeriod = PendingMembershipPeriod;
-    type RevocationPeriod = RevocationPeriod;
 }
 
 // Cert
@@ -195,7 +193,6 @@ impl pallet_duniter_wot::Config<Instance2> for Test {
 parameter_types! {
     pub const SmithsMembershipPeriod: u64 = 20;
     pub const SmithsPendingMembershipPeriod: u64 = 3;
-    pub const SmithsRevocationPeriod: u64 = 4;
 }
 
 impl pallet_membership::Config<Instance2> for Test {
@@ -209,7 +206,6 @@ impl pallet_membership::Config<Instance2> for Test {
     type MetaData = ();
     type OnEvent = SmithsSubWot;
     type PendingMembershipPeriod = SmithsPendingMembershipPeriod;
-    type RevocationPeriod = SmithsRevocationPeriod;
 }
 
 // SmithsCert
diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs
index 93ff97dc6..fe0f19d56 100644
--- a/pallets/membership/src/lib.rs
+++ b/pallets/membership/src/lib.rs
@@ -81,9 +81,6 @@ pub mod pallet {
         #[pallet::constant]
         /// Maximum period (in number of blocks), where an identity can remain pending subscription.
         type PendingMembershipPeriod: Get<Self::BlockNumber>;
-        #[pallet::constant]
-        /// Minimum duration (in number of blocks between a revocation and a new entry request
-        type RevocationPeriod: Get<Self::BlockNumber>;
     }
 
     // GENESIS STUFF //
@@ -356,13 +353,6 @@ pub mod pallet {
         }
         pub(super) fn do_revoke_membership(idty_id: T::IdtyId) -> Weight {
             if Self::remove_membership(&idty_id) {
-                if T::RevocationPeriod::get() > Zero::zero() {
-                    let block_number = frame_system::pallet::Pallet::<T>::block_number();
-                    let pruned_on = block_number + T::RevocationPeriod::get();
-
-                    RevokedMembership::<T, I>::insert(idty_id, ());
-                    RevokedMembershipsPrunedOn::<T, I>::append(pruned_on, idty_id);
-                }
                 Self::deposit_event(Event::MembershipRevoked(idty_id));
                 T::OnEvent::on_event(&sp_membership::Event::MembershipRevoked(idty_id));
             }
diff --git a/pallets/membership/src/mock.rs b/pallets/membership/src/mock.rs
index e9ea07467..afbe52f97 100644
--- a/pallets/membership/src/mock.rs
+++ b/pallets/membership/src/mock.rs
@@ -80,7 +80,6 @@ impl system::Config for Test {
 parameter_types! {
     pub const MembershipPeriod: BlockNumber = 5;
     pub const PendingMembershipPeriod: BlockNumber = 3;
-    pub const RevocationPeriod: BlockNumber = 4;
 }
 
 impl pallet_membership::Config for Test {
@@ -94,7 +93,6 @@ impl pallet_membership::Config for Test {
     type MetaData = ();
     type OnEvent = ();
     type PendingMembershipPeriod = PendingMembershipPeriod;
-    type RevocationPeriod = RevocationPeriod;
 }
 
 // Build genesis storage according to the mock runtime.
diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs
index 7bf469f49..5950b43f9 100644
--- a/runtime/common/src/pallets_config.rs
+++ b/runtime/common/src/pallets_config.rs
@@ -444,7 +444,7 @@ macro_rules! pallets_config {
         }
 
         impl pallet_membership::Config<frame_support::instances::Instance1> for Runtime {
-			type IsIdtyAllowedToClaimMembership = Wot;
+            type IsIdtyAllowedToClaimMembership = Wot;
             type IsIdtyAllowedToRenewMembership = Wot;
             type IsIdtyAllowedToRequestMembership = Wot;
             type Event = Event;
@@ -454,7 +454,6 @@ macro_rules! pallets_config {
             type MetaData = ();
             type OnEvent = OnMembershipEventHandler<Wot, Runtime>;
             type PendingMembershipPeriod = PendingMembershipPeriod;
-            type RevocationPeriod = frame_support::traits::ConstU32<0>;
         }
 
         impl pallet_certification::Config<Instance1> for Runtime {
@@ -481,7 +480,7 @@ macro_rules! pallets_config {
         }
 
         impl pallet_membership::Config<Instance2> for Runtime {
-			type IsIdtyAllowedToClaimMembership = SmithsSubWot;
+            type IsIdtyAllowedToClaimMembership = SmithsSubWot;
             type IsIdtyAllowedToRenewMembership = SmithsSubWot;
             type IsIdtyAllowedToRequestMembership = SmithsSubWot;
             type Event = Event;
@@ -491,7 +490,6 @@ macro_rules! pallets_config {
             type MetaData = SmithsMembershipMetaData<opaque::SessionKeysWrapper>;
             type OnEvent = OnSmithMembershipEventHandler<SmithsSubWot, Runtime>;
             type PendingMembershipPeriod = SmithPendingMembershipPeriod;
-            type RevocationPeriod = frame_support::traits::ConstU32<0>;
         }
 
         impl pallet_certification::Config<Instance2> for Runtime {
-- 
GitLab