From 040f7b17c2a539a7101e257460969131a2830d31 Mon Sep 17 00:00:00 2001 From: Mildred Ki'Lya <mildred-pub.git@mildred.fr> Date: Sat, 30 Jul 2022 11:46:12 +0200 Subject: [PATCH] Remove RevokedMembership that is always empty --- pallets/membership/src/lib.rs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs index fe0f19d56..0ca56c203 100644 --- a/pallets/membership/src/lib.rs +++ b/pallets/membership/src/lib.rs @@ -131,11 +131,6 @@ pub mod pallet { pub type PendingMembershipsExpireOn<T: Config<I>, I: 'static = ()> = StorageMap<_, Twox64Concat, T::BlockNumber, Vec<T::IdtyId>, ValueQuery>; - #[pallet::storage] - #[pallet::getter(fn revoked_membership)] - pub type RevokedMembership<T: Config<I>, I: 'static = ()> = - StorageMap<_, Twox64Concat, T::IdtyId, (), OptionQuery>; - #[pallet::storage] #[pallet::getter(fn revoked_memberships_pruned_on)] pub type RevokedMembershipsPrunedOn<T: Config<I>, I: 'static = ()> = @@ -337,9 +332,6 @@ pub mod pallet { if Membership::<T, I>::contains_key(&idty_id) { return Err(Error::<T, I>::MembershipAlreadyAcquired.into()); } - if RevokedMembership::<T, I>::contains_key(&idty_id) { - return Err(Error::<T, I>::MembershipRevokedRecently.into()); - } let block_number = frame_system::pallet::Pallet::<T>::block_number(); let expire_on = block_number + T::PendingMembershipPeriod::get(); @@ -405,12 +397,6 @@ pub mod pallet { fn prune_revoked_memberships(block_number: T::BlockNumber) -> Weight { let total_weight: Weight = 0; - if let Some(identities_ids) = RevokedMembershipsPrunedOn::<T, I>::take(block_number) { - for idty_id in identities_ids { - RevokedMembership::<T, I>::remove(idty_id); - } - } - total_weight } -- GitLab