diff --git a/pallets/duniter-wot/src/mock.rs b/pallets/duniter-wot/src/mock.rs index 458c40d119721b7bf08aa56924cf2132c8a91a74..56d836673f0d4fd90d746e3d23493e715a382825 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 93ff97dc6aeb1eda2316f1cfcdf01e17443ae930..fe0f19d5673e32be3d1575210020d19577f3f82f 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 e9ea07467cbde7fc38e857443f417048e26574dd..afbe52f97515c63ebca5dbe14912c531cf2e6839 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 7bf469f49c270c73f436fb359c13c5891667bafd..5950b43f9f1f25c99025ba044c84683af71db418 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 {