From fcd1736304b2372f2282c836669f2c24f7ead8e5 Mon Sep 17 00:00:00 2001
From: Mildred Ki'Lya <mildred-pub.git@mildred.fr>
Date: Wed, 7 Sep 2022 10:15:52 +0200
Subject: [PATCH] Remove dead code (MembershipRevokedRecently)
---
pallets/duniter-wot/src/tests.rs | 7 -------
pallets/membership/src/lib.rs | 15 ++++-----------
pallets/membership/src/tests.rs | 9 +--------
3 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/pallets/duniter-wot/src/tests.rs b/pallets/duniter-wot/src/tests.rs
index 7e1e8e901..adc70117e 100644
--- a/pallets/duniter-wot/src/tests.rs
+++ b/pallets/duniter-wot/src/tests.rs
@@ -154,13 +154,6 @@ fn test_revoke_smiths_them_rejoin() {
Some(4)
));
- // Dave should not be able to re-request membership before the RevocationPeriod end
- run_to_block(3);
- assert_noop!(
- SmithsMembership::request_membership(Origin::signed(4), ()),
- pallet_membership::Error::<Test, crate::Instance2>::MembershipRevokedRecently
- );
-
// At block #6, Dave shoud be able to request smith membership
run_to_block(6);
assert_ok!(SmithsMembership::request_membership(Origin::signed(4), ()));
diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs
index 18cda7b2c..807a4966f 100644
--- a/pallets/membership/src/lib.rs
+++ b/pallets/membership/src/lib.rs
@@ -180,8 +180,6 @@ pub mod pallet {
OriginNotAllowedToUseIdty,
/// Membership request not found
MembershipRequestNotFound,
- /// Membership revoked recently
- MembershipRevokedRecently,
}
// HOOKS //
@@ -292,7 +290,10 @@ pub mod pallet {
let idty_id = Self::ensure_origin_and_get_idty_id(origin, maybe_idty_id)?;
// Apply phase
- let _ = Self::do_revoke_membership(idty_id);
+ if Self::remove_membership(&idty_id) {
+ Self::deposit_event(Event::MembershipRevoked(idty_id));
+ T::OnEvent::on_event(&sp_membership::Event::MembershipRevoked(idty_id));
+ }
Ok(().into())
}
@@ -336,14 +337,6 @@ pub mod pallet {
Ok(().into())
}
- pub(super) fn do_revoke_membership(idty_id: T::IdtyId) -> Weight {
- if Self::remove_membership(&idty_id) {
- Self::deposit_event(Event::MembershipRevoked(idty_id));
- T::OnEvent::on_event(&sp_membership::Event::MembershipRevoked(idty_id));
- }
-
- 0
- }
fn ensure_origin_and_get_idty_id(
origin: OriginFor<T>,
maybe_idty_id: Option<T::IdtyId>,
diff --git a/pallets/membership/src/tests.rs b/pallets/membership/src/tests.rs
index 67fa62fd0..723605be8 100644
--- a/pallets/membership/src/tests.rs
+++ b/pallets/membership/src/tests.rs
@@ -113,14 +113,7 @@ fn test_membership_revocation() {
RuntimeEvent::DefaultMembership(Event::MembershipRevoked(0))
);
- // Membership 0 can't request membership before the end of RevokePeriod (1 + 4 = 5)
- run_to_block(2);
- assert_eq!(
- DefaultMembership::request_membership(Origin::signed(0), ()),
- Err(Error::<Test, _>::MembershipRevokedRecently.into())
- );
-
- // Membership 0 can request membership after the end of RevokePeriod (1 + 4 = 5)
+ // Membership 0 can re-request membership
run_to_block(5);
assert_ok!(DefaultMembership::request_membership(Origin::signed(0), ()),);
assert_eq!(
--
GitLab