From f4225a7addd03cc649a9d1a33b6658b6e65cd624 Mon Sep 17 00:00:00 2001
From: librelois <c@elo.tf>
Date: Tue, 12 Jul 2022 23:45:29 +0200
Subject: [PATCH] mod(membership): remove rule RenewablePeriod
---
.cargo/config | 2 +-
end2end-tests/cucumber-genesis/default.json | 2 --
end2end-tests/cucumber-genesis/wot.json | 2 --
node/src/chain_spec/gdev.rs | 29 ++---------------
node/src/chain_spec/gen_genesis_data.rs | 6 ----
node/src/chain_spec/gtest.rs | 2 --
pallets/duniter-test-parameters/src/lib.rs | 2 --
pallets/duniter-wot/src/mock.rs | 6 ----
pallets/identity/src/mock.rs | 1 -
pallets/membership/src/lib.rs | 28 ++++-------------
pallets/membership/src/mock.rs | 2 --
pallets/membership/src/tests.rs | 33 +++-----------------
primitives/membership/src/lib.rs | 1 -
resources/gdev.json | 2 --
resources/metadata.scale | Bin 120450 -> 120061 bytes
runtime/common/src/pallets_config.rs | 2 --
runtime/g1/src/parameters.rs | 3 --
runtime/gdev/src/lib.rs | 3 --
runtime/gdev/tests/common/mod.rs | 4 ---
runtime/gtest/src/parameters.rs | 3 --
20 files changed, 14 insertions(+), 119 deletions(-)
diff --git a/.cargo/config b/.cargo/config
index 3a03e9a4f..f5990d7a2 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,7 +1,7 @@
[alias]
cucumber = "test -p duniter-end2end-tests --test cucumber_tests --"
sanity-gdev = "test -p duniter-live-tests --test sanity_gdev -- --nocapture"
-tu = "test --workspace --exclude duniter-end2end-tests"
+tu = "test --workspace --exclude duniter-end2end-tests --exclude duniter-live-tests"
tb = "test --features runtime-benchmarks -p"
xtask = "run --package xtask --"
diff --git a/end2end-tests/cucumber-genesis/default.json b/end2end-tests/cucumber-genesis/default.json
index b23ed7e91..32abeaa56 100644
--- a/end2end-tests/cucumber-genesis/default.json
+++ b/end2end-tests/cucumber-genesis/default.json
@@ -27,7 +27,6 @@
"idty_confirm_period": 40,
"idty_creation_period": 50,
"membership_period": 1000,
- "membership_renewable_period": 50,
"pending_membership_period": 500,
"ud_creation_period": 10,
"ud_reeval_period": 100,
@@ -36,7 +35,6 @@
"smith_cert_min_received_cert_to_issue_cert": 2,
"smith_cert_validity_period": 1000,
"smith_membership_period": 1000,
- "smith_membership_renewable_period": 20,
"smith_pending_membership_period": 500,
"smiths_wot_first_cert_issuable_on": 20,
"smiths_wot_min_cert_for_membership": 2,
diff --git a/end2end-tests/cucumber-genesis/wot.json b/end2end-tests/cucumber-genesis/wot.json
index 72e61ebcd..7b4639842 100644
--- a/end2end-tests/cucumber-genesis/wot.json
+++ b/end2end-tests/cucumber-genesis/wot.json
@@ -32,7 +32,6 @@
"idty_confirm_period": 40,
"idty_creation_period": 50,
"membership_period": 1000,
- "membership_renewable_period": 50,
"pending_membership_period": 500,
"ud_creation_period": 10,
"ud_reeval_period": 100,
@@ -41,7 +40,6 @@
"smith_cert_min_received_cert_to_issue_cert": 2,
"smith_cert_validity_period": 1000,
"smith_membership_period": 1000,
- "smith_membership_renewable_period": 20,
"smith_pending_membership_period": 500,
"smiths_wot_first_cert_issuable_on": 20,
"smiths_wot_min_cert_for_membership": 2,
diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs
index 9d44f49c1..299482d17 100644
--- a/node/src/chain_spec/gdev.rs
+++ b/node/src/chain_spec/gdev.rs
@@ -100,9 +100,7 @@ pub fn development_chain_spec() -> Result<ChainSpec, String> {
genesis_certs_expire_on: 100_000,
genesis_smith_certs_expire_on: 100_000,
genesis_memberships_expire_on: 100_000,
- genesis_memberships_renewable_on: 50,
genesis_smith_memberships_expire_on: 100_000,
- genesis_smith_memberships_renewable_on: 50,
}),
)
} else {
@@ -189,9 +187,7 @@ pub fn gen_live_conf() -> Result<ChainSpec, String> {
genesis_certs_expire_on: 100_000,
genesis_smith_certs_expire_on: 100_000,
genesis_memberships_expire_on: 100_000,
- genesis_memberships_renewable_on: 50,
genesis_smith_memberships_expire_on: 100_000,
- genesis_smith_memberships_renewable_on: 50,
}),
)
}
@@ -262,10 +258,7 @@ fn gen_genesis_for_local_chain(
let cert_validity_period = get_env_u32("DUNITER_CERT_VALIDITY_PERIOD", 1_000);
let first_ud = 1_000;
let membership_period = get_env_u32("DUNITER_MEMBERSHIP_PERIOD", 1_000);
- let membership_renewable_period = get_env_u32("DUNITER_MEMBERSHIP_RENEWABLE_PERIOD", 50);
let smith_cert_validity_period = get_env_u32("DUNITER_SMITH_CERT_VALIDITY_PERIOD", 1_000);
- let smith_membership_renewable_period =
- get_env_u32("DUNITER_SMITH_MEMBERSHIP_RENEWABLE_PERIOD", 20);
let smith_membership_period = get_env_u32("DUNITER_SMITH_MEMBERSHIP_PERIOD", 1_000);
let ud_creation_period = get_env_u32("DUNITER_UD_CREATION_PERIOD", 10);
let ud_reeval_period = get_env_u32("DUNITER_UD_REEEVAL_PERIOD", 200);
@@ -313,7 +306,6 @@ fn gen_genesis_for_local_chain(
idty_confirm_period: 40,
idty_creation_period: 50,
membership_period,
- membership_renewable_period,
pending_membership_period: 500,
ud_creation_period,
ud_reeval_period,
@@ -322,7 +314,6 @@ fn gen_genesis_for_local_chain(
smith_cert_min_received_cert_to_issue_cert: 2,
smith_cert_validity_period: 1_000,
smith_membership_period,
- smith_membership_renewable_period: 50,
smith_pending_membership_period: 500,
smiths_wot_first_cert_issuable_on: 20,
smiths_wot_min_cert_for_membership: 2,
@@ -384,15 +375,7 @@ fn gen_genesis_for_local_chain(
},
membership: MembershipConfig {
memberships: (1..=initial_identities.len())
- .map(|i| {
- (
- i as u32,
- MembershipData {
- expire_on: 0,
- renewable_on: membership_renewable_period,
- },
- )
- })
+ .map(|i| (i as u32, MembershipData { expire_on: 0 }))
.collect(),
},
cert: CertConfig {
@@ -401,15 +384,7 @@ fn gen_genesis_for_local_chain(
},
smiths_membership: SmithsMembershipConfig {
memberships: (1..=initial_smiths_len)
- .map(|i| {
- (
- i as u32,
- MembershipData {
- expire_on: 0,
- renewable_on: smith_membership_renewable_period,
- },
- )
- })
+ .map(|i| (i as u32, MembershipData { expire_on: 0 }))
.collect(),
},
smiths_cert: SmithsCertConfig {
diff --git a/node/src/chain_spec/gen_genesis_data.rs b/node/src/chain_spec/gen_genesis_data.rs
index d9c66c76a..24751d615 100644
--- a/node/src/chain_spec/gen_genesis_data.rs
+++ b/node/src/chain_spec/gen_genesis_data.rs
@@ -45,9 +45,7 @@ pub struct ParamsAppliedAtGenesis {
pub genesis_certs_expire_on: u32,
pub genesis_smith_certs_expire_on: u32,
pub genesis_memberships_expire_on: u32,
- pub genesis_memberships_renewable_on: u32,
pub genesis_smith_memberships_expire_on: u32,
- pub genesis_smith_memberships_renewable_on: u32,
}
#[derive(Deserialize, Serialize)]
@@ -96,9 +94,7 @@ where
genesis_certs_expire_on,
genesis_smith_certs_expire_on,
genesis_memberships_expire_on,
- genesis_memberships_renewable_on,
genesis_smith_memberships_expire_on,
- genesis_smith_memberships_renewable_on,
} = params_applied_at_genesis.unwrap_or_default();
let genesis_timestamp: u64 =
@@ -203,7 +199,6 @@ where
.map_or(genesis_memberships_expire_on, |expire_on| {
to_bn(genesis_timestamp, expire_on)
}),
- renewable_on: genesis_memberships_renewable_on,
},
);
@@ -303,7 +298,6 @@ where
*idty_index,
MembershipData {
expire_on: genesis_smith_memberships_expire_on,
- renewable_on: genesis_smith_memberships_renewable_on,
},
);
}
diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs
index 0b1f682e5..5d2ea9201 100644
--- a/node/src/chain_spec/gtest.rs
+++ b/node/src/chain_spec/gtest.rs
@@ -223,7 +223,6 @@ fn gen_genesis_for_local_chain(
i as u32,
MembershipData {
expire_on: gtest_runtime::MembershipPeriod::get(),
- renewable_on: gtest_runtime::RenewablePeriod::get(),
},
)
})
@@ -243,7 +242,6 @@ fn gen_genesis_for_local_chain(
i as u32,
MembershipData {
expire_on: gtest_runtime::SmithMembershipPeriod::get(),
- renewable_on: gtest_runtime::SmithRenewablePeriod::get(),
},
)
})
diff --git a/pallets/duniter-test-parameters/src/lib.rs b/pallets/duniter-test-parameters/src/lib.rs
index 9a3a6f402..d7232aa03 100644
--- a/pallets/duniter-test-parameters/src/lib.rs
+++ b/pallets/duniter-test-parameters/src/lib.rs
@@ -44,7 +44,6 @@ pub mod types {
pub idty_confirm_period: BlockNumber,
pub idty_creation_period: BlockNumber,
pub membership_period: BlockNumber,
- pub membership_renewable_period: BlockNumber,
pub pending_membership_period: BlockNumber,
pub ud_creation_period: BlockNumber,
pub ud_reeval_period: BlockNumber,
@@ -53,7 +52,6 @@ pub mod types {
pub smith_cert_min_received_cert_to_issue_cert: CertCount,
pub smith_cert_validity_period: BlockNumber,
pub smith_membership_period: BlockNumber,
- pub smith_membership_renewable_period: BlockNumber,
pub smith_pending_membership_period: BlockNumber,
pub smiths_wot_first_cert_issuable_on: BlockNumber,
pub smiths_wot_min_cert_for_membership: CertCount,
diff --git a/pallets/duniter-wot/src/mock.rs b/pallets/duniter-wot/src/mock.rs
index 5e7ac0454..082388a87 100644
--- a/pallets/duniter-wot/src/mock.rs
+++ b/pallets/duniter-wot/src/mock.rs
@@ -132,7 +132,6 @@ impl pallet_identity::Config for Test {
parameter_types! {
pub const MembershipPeriod: u64 = 8;
pub const PendingMembershipPeriod: u64 = 3;
- pub const RenewablePeriod: u64 = 2;
pub const RevocationPeriod: u64 = 4;
}
@@ -146,7 +145,6 @@ impl pallet_membership::Config<Instance1> for Test {
type MetaData = crate::MembershipMetaData<u64>;
type OnEvent = DuniterWot;
type PendingMembershipPeriod = PendingMembershipPeriod;
- type RenewablePeriod = RenewablePeriod;
type RevocationPeriod = RevocationPeriod;
}
@@ -189,7 +187,6 @@ impl pallet_duniter_wot::Config<Instance2> for Test {
parameter_types! {
pub const SmithsMembershipPeriod: u64 = 20;
pub const SmithsPendingMembershipPeriod: u64 = 3;
- pub const SmithsRenewablePeriod: u64 = 2;
pub const SmithsRevocationPeriod: u64 = 4;
}
@@ -203,7 +200,6 @@ impl pallet_membership::Config<Instance2> for Test {
type MetaData = crate::MembershipMetaData<u64>;
type OnEvent = SmithsSubWot;
type PendingMembershipPeriod = SmithsPendingMembershipPeriod;
- type RenewablePeriod = SmithsRenewablePeriod;
type RevocationPeriod = SmithsRevocationPeriod;
}
@@ -265,7 +261,6 @@ pub fn new_test_ext(
i as u32,
sp_membership::MembershipData {
expire_on: MembershipPeriod::get(),
- renewable_on: RenewablePeriod::get(),
},
)
})
@@ -288,7 +283,6 @@ pub fn new_test_ext(
i as u32,
sp_membership::MembershipData {
expire_on: SmithsMembershipPeriod::get(),
- renewable_on: SmithsRenewablePeriod::get(),
},
)
})
diff --git a/pallets/identity/src/mock.rs b/pallets/identity/src/mock.rs
index 2e34e7494..d6f973e04 100644
--- a/pallets/identity/src/mock.rs
+++ b/pallets/identity/src/mock.rs
@@ -80,7 +80,6 @@ parameter_types! {
pub const ConfirmPeriod: u64 = 2;
pub const IdtyCreationPeriod: u64 = 3;
pub const MaxInactivityPeriod: u64 = 5;
- pub const RenewablePeriod: u64 = 3;
pub const ValidationPeriod: u64 = 2;
}
diff --git a/pallets/membership/src/lib.rs b/pallets/membership/src/lib.rs
index af1e859d2..1232c04d9 100644
--- a/pallets/membership/src/lib.rs
+++ b/pallets/membership/src/lib.rs
@@ -78,9 +78,6 @@ pub mod pallet {
/// Maximum period (in number of blocks), where an identity can remain pending subscription.
type PendingMembershipPeriod: Get<Self::BlockNumber>;
#[pallet::constant]
- /// Duration after which a membership is renewable
- type RenewablePeriod: Get<Self::BlockNumber>;
- #[pallet::constant]
/// Minimum duration (in number of blocks between a revocation and a new entry request
type RevocationPeriod: Get<Self::BlockNumber>;
}
@@ -184,8 +181,6 @@ pub mod pallet {
MembershipAlreadyAcquired,
/// Membership already requested
MembershipAlreadyRequested,
- /// Membership not yet renewable
- MembershipNotYetRenewable,
/// Membership not found
MembershipNotFound,
/// Origin not allowed to use this identity
@@ -280,14 +275,10 @@ pub mod pallet {
return Err(Error::<T, I>::IdtyNotAllowedToRenewMembership.into());
}
- if let Some(membership_data) = Self::get_membership(&idty_id) {
- let block_number = frame_system::pallet::Pallet::<T>::block_number();
- if membership_data.renewable_on > block_number {
- return Err(Error::<T, I>::MembershipNotYetRenewable.into());
- }
- } else {
- return Err(Error::<T, I>::MembershipNotFound.into());
- }
+ ensure!(
+ Self::get_membership(&idty_id).is_some(),
+ Error::<T, I>::MembershipNotFound
+ );
let _ = Self::do_renew_membership(idty_id);
@@ -321,15 +312,8 @@ pub mod pallet {
fn do_renew_membership_inner(idty_id: T::IdtyId) -> Weight {
let block_number = frame_system::pallet::Pallet::<T>::block_number();
let expire_on = block_number + T::MembershipPeriod::get();
- let renewable_on = block_number + T::RenewablePeriod::get();
-
- Self::insert_membership(
- idty_id,
- MembershipData {
- expire_on,
- renewable_on,
- },
- );
+
+ Self::insert_membership(idty_id, MembershipData { expire_on });
MembershipsExpireOn::<T, I>::append(expire_on, idty_id);
0
}
diff --git a/pallets/membership/src/mock.rs b/pallets/membership/src/mock.rs
index e21a41537..4e1b49dd5 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 RenewablePeriod: BlockNumber = 2;
pub const RevocationPeriod: BlockNumber = 4;
}
@@ -94,7 +93,6 @@ impl pallet_membership::Config for Test {
type MetaData = ();
type OnEvent = ();
type PendingMembershipPeriod = PendingMembershipPeriod;
- type RenewablePeriod = RenewablePeriod;
type RevocationPeriod = RevocationPeriod;
}
diff --git a/pallets/membership/src/tests.rs b/pallets/membership/src/tests.rs
index 8e9635597..67fa62fd0 100644
--- a/pallets/membership/src/tests.rs
+++ b/pallets/membership/src/tests.rs
@@ -28,7 +28,6 @@ fn default_gen_conf() -> DefaultMembershipConfig {
memberships: btreemap![
0 => MembershipData {
expire_on: 3,
- renewable_on: 2
}
],
}
@@ -41,27 +40,12 @@ fn test_genesis_build() {
// Verify state
assert_eq!(
DefaultMembership::membership(0),
- Some(MembershipData {
- expire_on: 3,
- renewable_on: 2
- })
+ Some(MembershipData { expire_on: 3 })
);
assert_eq!(DefaultMembership::members_count(), 1);
});
}
-#[test]
-fn test_membership_not_yet_renewable() {
- new_test_ext(default_gen_conf()).execute_with(|| {
- run_to_block(1);
- // Merbership 0 cannot be renewed before #2
- assert_eq!(
- DefaultMembership::renew_membership(Origin::signed(0), None),
- Err(Error::<Test, _>::MembershipNotYetRenewable.into())
- );
- });
-}
-
#[test]
fn test_membership_already_acquired() {
new_test_ext(default_gen_conf()).execute_with(|| {
@@ -190,23 +174,16 @@ fn test_membership_workflow() {
RuntimeEvent::DefaultMembership(Event::MembershipAcquired(0))
);
- // Then, idty 0 claim renewal, should fail
- run_to_block(3);
- assert_eq!(
- DefaultMembership::renew_membership(Origin::signed(0), None),
- Err(Error::<Test, _>::MembershipNotYetRenewable.into())
- );
-
- // Then, idty 0 claim renewal after renewable period, should success
- run_to_block(2 + RenewablePeriod::get());
+ // Then, idty 0 claim renewal, should success
+ run_to_block(2);
assert_ok!(DefaultMembership::renew_membership(Origin::signed(0), None),);
// Then, idty 0 shoul still member until membership period ended
- run_to_block(2 + RenewablePeriod::get() + MembershipPeriod::get() - 1);
+ run_to_block(2 + MembershipPeriod::get() - 1);
assert!(DefaultMembership::is_member(&0));
// Then, idty 0 shoul expire after membership period
- run_to_block(2 + RenewablePeriod::get() + MembershipPeriod::get());
+ run_to_block(2 + MembershipPeriod::get());
assert!(!DefaultMembership::is_member(&0),);
assert_eq!(
System::events()[0].event,
diff --git a/primitives/membership/src/lib.rs b/primitives/membership/src/lib.rs
index 600ae3661..97194ce0d 100644
--- a/primitives/membership/src/lib.rs
+++ b/primitives/membership/src/lib.rs
@@ -46,5 +46,4 @@ pub enum Event<IdtyId, MetaData = ()> {
#[derive(Encode, Decode, Default, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)]
pub struct MembershipData<BlockNumber: Decode + Encode + TypeInfo> {
pub expire_on: BlockNumber,
- pub renewable_on: BlockNumber,
}
diff --git a/resources/gdev.json b/resources/gdev.json
index f0be34c7e..45aa222ba 100644
--- a/resources/gdev.json
+++ b/resources/gdev.json
@@ -141,7 +141,6 @@
"idty_confirm_period": 14400,
"idty_creation_period": 14400,
"membership_period": 1051200,
- "membership_renewable_period": 172800,
"pending_membership_period": 172800,
"ud_creation_period": 14400,
"ud_reeval_period": 100800,
@@ -150,7 +149,6 @@
"smith_cert_min_received_cert_to_issue_cert": 3,
"smith_cert_validity_period": 2102400,
"smith_membership_period": 1051200,
- "smith_membership_renewable_period": 172800,
"smith_pending_membership_period": 172800,
"smiths_wot_first_cert_issuable_on": 14400,
"smiths_wot_min_cert_for_membership": 3,
diff --git a/resources/metadata.scale b/resources/metadata.scale
index 03a32f390272d496544efb76a0d62d77f0ffc50a..968b774a7abe5dd37311695ef4112ee05e6e9946 100644
GIT binary patch
delta 210
zcmZo#%l>yId&3sSr;3ab+n*^isxodjS7vl(+`dMI(M6e&W%@^VMycr<9*o+I8rxs{
zF~%~AdibX1CZ!e?XJi)m<(IhSm*%A~uubz~G-PC-elmd3g^^=AUm&9;Bj@&wUW}G3
zr0bgw)YrZJav)=zJ5wR!bjO*D(bEr9GqP=;Gm~+yA|uaqtKE#Zwny(_+{O&$Ob2rE
Lwl6%$_)r7@L%c+Q
delta 550
zcmeynlD%myd&3sSr;3aT+n*^isxpe^<fi5(r4|)uWER91rRJrUCnn{jPIpvh6yMIR
z%;?NGy-tOZO*9_2DnAuQ7iA6(MwQfxg3O}n3mq6m*bKlXO%L>D6raA%ol%QXXZuZe
z##l!G6koV)e)%PlsU<-$D;d~W3J{VCdHE#@m8m5Pa3^^nB!N2J@=Nnl7}%$Kdomg_
za!jxFWOQNVoGu^0XvxU6{f{T3B@11xoDQ_Id;60B#yEGTiHy?&XE26Lzfi>}x_#*k
z#<_}&0@JVTW4z^V1NUq|YEfo>ihzI-0|Nug9tD@uqQsKS{5*xkw35^!h4PHd<P3#G
g1w@!DWELYrV*0xMjCtF;cQbl0Q`zM0K$HDN0sY^;SpWb4
diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs
index 93050373d..bc5e82e5a 100644
--- a/runtime/common/src/pallets_config.rs
+++ b/runtime/common/src/pallets_config.rs
@@ -447,7 +447,6 @@ macro_rules! pallets_config {
type MetaData = pallet_duniter_wot::MembershipMetaData<AccountId>;
type OnEvent = OnMembershipEventHandler<Wot, Runtime>;
type PendingMembershipPeriod = PendingMembershipPeriod;
- type RenewablePeriod = RenewablePeriod;
type RevocationPeriod = frame_support::traits::ConstU32<0>;
}
@@ -484,7 +483,6 @@ macro_rules! pallets_config {
type MetaData = SmithsMembershipMetaData<opaque::SessionKeysWrapper>;
type OnEvent = OnSmithMembershipEventHandler<SmithsSubWot, Runtime>;
type PendingMembershipPeriod = SmithPendingMembershipPeriod;
- type RenewablePeriod = SmithRenewablePeriod;
type RevocationPeriod = frame_support::traits::ConstU32<0>;
}
diff --git a/runtime/g1/src/parameters.rs b/runtime/g1/src/parameters.rs
index 62ba9ada4..24a32ac67 100644
--- a/runtime/g1/src/parameters.rs
+++ b/runtime/g1/src/parameters.rs
@@ -111,7 +111,6 @@ parameter_types! {
parameter_types! {
pub const MembershipPeriod: BlockNumber = YEARS;
pub const PendingMembershipPeriod: BlockNumber = 2 * MONTHS;
- pub const RenewablePeriod: BlockNumber = 2 * MONTHS;
}
// Certification
@@ -135,7 +134,6 @@ parameter_types! {
parameter_types! {
pub const SmithMembershipPeriod: BlockNumber = 73 * DAYS;
pub const SmithPendingMembershipPeriod: BlockNumber = 12 * DAYS;
- pub const SmithRenewablePeriod: BlockNumber = 12 * DAYS;
}
// Certification
@@ -143,7 +141,6 @@ parameter_types! {
pub const SmithCertPeriod: BlockNumber = 5 * DAYS;
pub const SmithMaxByIssuer: u32 = 12;
pub const SmithMinReceivedCertToBeAbleToIssueCert: u32 = 5;
- pub const SmithCertRenewablePeriod: BlockNumber = 12 * DAYS;
pub const SmithValidityPeriod: BlockNumber = 146 * DAYS;
}
diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs
index 80c84ed22..807446155 100644
--- a/runtime/gdev/src/lib.rs
+++ b/runtime/gdev/src/lib.rs
@@ -231,7 +231,6 @@ common_runtime::pallets_config! {
pub type ConfirmPeriod = pallet_duniter_test_parameters::IdtyConfirmPeriod<Runtime>;
pub type IdtyCreationPeriod = pallet_duniter_test_parameters::IdtyCreationPeriod<Runtime>;
pub type MembershipPeriod = pallet_duniter_test_parameters::MembershipPeriod<Runtime>;
- pub type RenewablePeriod = pallet_duniter_test_parameters::MembershipRenewablePeriod<Runtime>;
pub type PendingMembershipPeriod = pallet_duniter_test_parameters::PendingMembershipPeriod<Runtime>;
#[cfg(not(test))]
pub type UdCreationPeriod = pallet_duniter_test_parameters::UdCreationPeriod<Runtime>;
@@ -250,8 +249,6 @@ common_runtime::pallets_config! {
pub type SmithMembershipPeriod = pallet_duniter_test_parameters::SmithMembershipPeriod<Runtime>;
pub type SmithPendingMembershipPeriod =
pallet_duniter_test_parameters::SmithPendingMembershipPeriod<Runtime>;
- pub type SmithRenewablePeriod =
- pallet_duniter_test_parameters::SmithMembershipRenewablePeriod<Runtime>;
pub type SmithsWotFirstCertIssuableOn =
pallet_duniter_test_parameters::SmithsWotFirstCertIssuableOn<Runtime>;
pub type SmithsWotMinCertForMembership =
diff --git a/runtime/gdev/tests/common/mod.rs b/runtime/gdev/tests/common/mod.rs
index 16bd159b3..323fbeca5 100644
--- a/runtime/gdev/tests/common/mod.rs
+++ b/runtime/gdev/tests/common/mod.rs
@@ -103,7 +103,6 @@ impl ExtBuilder {
idty_confirm_period: 40,
idty_creation_period: 50,
membership_period: 1_000,
- membership_renewable_period: 5,
pending_membership_period: 500,
ud_creation_period: 10,
ud_reeval_period: 10 * 20,
@@ -112,7 +111,6 @@ impl ExtBuilder {
smith_cert_min_received_cert_to_issue_cert: 2,
smith_cert_validity_period: 1_000,
smith_membership_period: 1_000,
- smith_membership_renewable_period: 50,
smith_pending_membership_period: 500,
smiths_wot_first_cert_issuable_on: 20,
smiths_wot_min_cert_for_membership: 2,
@@ -224,7 +222,6 @@ impl ExtBuilder {
i as u32,
MembershipData {
expire_on: parameters.membership_period,
- renewable_on: parameters.membership_renewable_period,
},
)
})
@@ -247,7 +244,6 @@ impl ExtBuilder {
i as u32,
MembershipData {
expire_on: parameters.smith_membership_period,
- renewable_on: parameters.smith_membership_renewable_period,
},
)
})
diff --git a/runtime/gtest/src/parameters.rs b/runtime/gtest/src/parameters.rs
index 8b9fbd05f..745786181 100644
--- a/runtime/gtest/src/parameters.rs
+++ b/runtime/gtest/src/parameters.rs
@@ -112,7 +112,6 @@ frame_support::parameter_types! {
parameter_types! {
pub const MembershipPeriod: BlockNumber = 73 * DAYS;
pub const PendingMembershipPeriod: BlockNumber = 12 * DAYS;
- pub const RenewablePeriod: BlockNumber = 12 * DAYS;
}
// Certification
@@ -135,7 +134,6 @@ parameter_types! {
parameter_types! {
pub const SmithMembershipPeriod: BlockNumber = 73 * DAYS;
pub const SmithPendingMembershipPeriod: BlockNumber = 12 * DAYS;
- pub const SmithRenewablePeriod: BlockNumber = 12 * DAYS;
}
// Certification
@@ -143,7 +141,6 @@ parameter_types! {
pub const SmithCertPeriod: BlockNumber = DAYS;
pub const SmithMaxByIssuer: u32 = 100;
pub const SmithMinReceivedCertToBeAbleToIssueCert: u32 = 5;
- pub const SmithCertRenewablePeriod: BlockNumber = 12 * DAYS;
pub const SmithValidityPeriod: BlockNumber = 146 * DAYS;
}
--
GitLab