diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs index 84591277fec1e401e10f7095d08ff607ceb1dfb5..fe2a6d9a041408f66ac4c1730d6b30dde586e3af 100644 --- a/node/src/chain_spec/gdev.rs +++ b/node/src/chain_spec/gdev.rs @@ -266,7 +266,6 @@ fn gen_genesis_conf( cert_validity_period, idty_confirm_period: 40, idty_creation_period: 50, - idty_max_disabled_period: 1_000, membership_period, membership_renewable_period, pending_membership_period: 500, diff --git a/pallets/duniter-test-parameters/src/lib.rs b/pallets/duniter-test-parameters/src/lib.rs index b6f41385101acff938a97ea52090c374449c64dc..c7244a4d9f383ca16156b651839d57ab4596a8ed 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 cert_validity_period: BlockNumber, pub idty_confirm_period: BlockNumber, pub idty_creation_period: BlockNumber, - pub idty_max_disabled_period: BlockNumber, pub membership_period: BlockNumber, pub membership_renewable_period: BlockNumber, pub pending_membership_period: BlockNumber, diff --git a/pallets/duniter-wot/src/mock.rs b/pallets/duniter-wot/src/mock.rs index 485a9625338f5f47c1a4307d9e26cf81b5babe7d..6a5f214e1451b8aae948b5af76046a769385e019 100644 --- a/pallets/duniter-wot/src/mock.rs +++ b/pallets/duniter-wot/src/mock.rs @@ -95,7 +95,6 @@ impl pallet_duniter_wot::Config<Instance1> for Test { parameter_types! { pub const ConfirmPeriod: u64 = 2; pub const IdtyCreationPeriod: u64 = 3; - pub const MaxDisabledPeriod: u64 = 4; pub const ValidationPeriod: u64 = 2; } @@ -116,7 +115,6 @@ impl pallet_identity::Config for Test { type IdtyValidationOrigin = system::EnsureRoot<AccountId>; type IsMember = Membership; type OnIdtyChange = DuniterWot; - type MaxDisabledPeriod = MaxDisabledPeriod; type RemoveIdentityConsumers = (); type RevocationSigner = UintAuthorityId; type RevocationSignature = TestSignature; diff --git a/pallets/identity/src/lib.rs b/pallets/identity/src/lib.rs index 07cea64a825c146e6d9b484d632edc10dd665f56..8ade71164c27630328ed4b732c7dfa8df861dc34 100644 --- a/pallets/identity/src/lib.rs +++ b/pallets/identity/src/lib.rs @@ -86,10 +86,6 @@ pub mod pallet { type IsMember: sp_runtime::traits::IsMember<Self::IdtyIndex>; /// On identity confirmed by it's owner type OnIdtyChange: OnIdtyChange<Self>; - #[pallet::constant] - /// Maximum period with disabled status, after this period, the identity is permanently - /// deleted - type MaxDisabledPeriod: Get<Self::BlockNumber>; /// Handle the logic that remove all identity consumers. /// "identity consumers" mean all things that rely on the existence of the identity. type RemoveIdentityConsumers: RemoveIdentityConsumers<Self::IdtyIndex>; diff --git a/pallets/identity/src/mock.rs b/pallets/identity/src/mock.rs index 159ca65949e62c49dd966cf9f6bc7a3bcb65aaef..420bfa10bdc9583b43eb82aab5344f220c630593 100644 --- a/pallets/identity/src/mock.rs +++ b/pallets/identity/src/mock.rs @@ -79,7 +79,6 @@ parameter_types! { pub const ConfirmPeriod: u64 = 2; pub const IdtyCreationPeriod: u64 = 3; pub const MaxInactivityPeriod: u64 = 5; - pub const MaxDisabledPeriod: u64 = 4; pub const RenewablePeriod: u64 = 3; pub const ValidationPeriod: u64 = 2; } @@ -108,7 +107,6 @@ impl pallet_identity::Config for Test { type IdtyValidationOrigin = system::EnsureRoot<AccountId>; type IsMember = IsMemberTestImpl; type OnIdtyChange = (); - type MaxDisabledPeriod = MaxDisabledPeriod; type RemoveIdentityConsumers = (); type RevocationSigner = UintAuthorityId; type RevocationSignature = TestSignature; diff --git a/resources/gdev.json b/resources/gdev.json index c6a09c03458821901c3305c8ffa0fb79a282a8bd..46f27c0fe53d93c27e6778600dbfef38d138d866 100644 --- a/resources/gdev.json +++ b/resources/gdev.json @@ -26,7 +26,6 @@ "cert_validity_period": 100000, "idty_confirm_period": 40, "idty_creation_period": 50, - "idty_max_disabled_period": 1000, "membership_period": 100000, "membership_renewable_period": 50, "pending_membership_period": 500, diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs index 7cc36f47e3d7aebeb17db679a9a61379425ddfad..cf6cfbbf3902b806225bba2181d35e7edd38ad7d 100644 --- a/runtime/common/src/pallets_config.rs +++ b/runtime/common/src/pallets_config.rs @@ -358,7 +358,6 @@ macro_rules! pallets_config { type IdtyValidationOrigin = EnsureRoot<Self::AccountId>; type IsMember = Membership; type OnIdtyChange = Wot; - type MaxDisabledPeriod = MaxDisabledPeriod; type RemoveIdentityConsumers = RemoveIdentityConsumersImpl<Self>; type RevocationSigner = <Signature as sp_runtime::traits::Verify>::Signer; type RevocationSignature = Signature; diff --git a/runtime/g1/src/parameters.rs b/runtime/g1/src/parameters.rs index c057b16b4797d927d666bae0271c96e91c067ba5..f1bf8f5b1f67c8d81f012ac0cdf8faad415d89cc 100644 --- a/runtime/g1/src/parameters.rs +++ b/runtime/g1/src/parameters.rs @@ -105,7 +105,6 @@ parameter_types! { parameter_types! { pub const ConfirmPeriod: BlockNumber = 14 * DAYS; pub const IdtyCreationPeriod: BlockNumber = MONTHS; - pub const MaxDisabledPeriod: BlockNumber = YEARS; pub const ValidationPeriod: BlockNumber = YEARS; } diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs index cf561427abd6202938b739a0e5d6b32956240f45..7802aaa513417e4bd481dc05e26262a26b76e6df 100644 --- a/runtime/gdev/src/lib.rs +++ b/runtime/gdev/src/lib.rs @@ -192,7 +192,6 @@ common_runtime::pallets_config! { pub type ValidityPeriod = pallet_duniter_test_parameters::CertValidityPeriod<Runtime>; pub type ConfirmPeriod = pallet_duniter_test_parameters::IdtyConfirmPeriod<Runtime>; pub type IdtyCreationPeriod = pallet_duniter_test_parameters::IdtyCreationPeriod<Runtime>; - pub type MaxDisabledPeriod = pallet_duniter_test_parameters::IdtyMaxDisabledPeriod<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>; diff --git a/runtime/gdev/tests/common/mod.rs b/runtime/gdev/tests/common/mod.rs index 5c11423796262b412a3f1c251e73d7ed80617535..d9a292ca24ca74a2dc485e1e6109b670f793f720 100644 --- a/runtime/gdev/tests/common/mod.rs +++ b/runtime/gdev/tests/common/mod.rs @@ -103,7 +103,6 @@ impl ExtBuilder { cert_validity_period: 10_000, idty_confirm_period: 40, idty_creation_period: 50, - idty_max_disabled_period: 1_000, membership_period: 1_000, membership_renewable_period: 5, pending_membership_period: 500, diff --git a/runtime/gtest/src/parameters.rs b/runtime/gtest/src/parameters.rs index f0af8ba2574106e44455368e77b6a59afe5081b3..ece1ba7e91f005e5dd70705f5e695a5aac508519 100644 --- a/runtime/gtest/src/parameters.rs +++ b/runtime/gtest/src/parameters.rs @@ -105,7 +105,6 @@ parameter_types! { frame_support::parameter_types! { pub const ConfirmPeriod: BlockNumber = 8 * HOURS; pub const IdtyCreationPeriod: BlockNumber = DAYS; - pub const MaxDisabledPeriod: BlockNumber = 73 * DAYS; } // Membership