diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs index 754ee00c3856923f88ea6bab38f68206903c89b7..63ba7addf32549f1faf2001972cb56b858eaf654 100644 --- a/node/src/chain_spec/gdev.rs +++ b/node/src/chain_spec/gdev.rs @@ -17,8 +17,8 @@ use super::*; use common_runtime::entities::IdtyName; use gdev_runtime::{ - AccountId, BalancesConfig, GenesisConfig, GenesisParameters, GrandpaConfig, IdentityConfig, - IdtyValue, MembershipConfig, ParametersConfig, StrongCertConfig, SudoConfig, SystemConfig, + AccountId, BalancesConfig, CertConfig, GenesisConfig, GenesisParameters, GrandpaConfig, + IdentityConfig, IdtyValue, MembershipConfig, ParametersConfig, SudoConfig, SystemConfig, UdAccountsStorageConfig, UniversalDividendConfig, WASM_BINARY, }; use maplit::btreemap; @@ -166,7 +166,7 @@ fn devnet_genesis( }) .collect(), }, - strong_cert: StrongCertConfig { + cert: CertConfig { apply_cert_period_at_genesis: false, certs_by_issuer: clique_wot(initial_identities.len(), cert_validity_period), }, diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs index cc7b7066582ea69f866dcdfaf563f7df66e0638b..79c21b10fa427faf6f7e36135c28d4e1578359e3 100644 --- a/node/src/chain_spec/gtest.rs +++ b/node/src/chain_spec/gtest.rs @@ -18,8 +18,8 @@ use super::*; use common_runtime::constants::*; use common_runtime::entities::IdtyName; use gtest_runtime::{ - opaque::SessionKeys, AccountId, BabeConfig, BalancesConfig, GenesisConfig, IdentityConfig, - IdtyValue, ImOnlineId, MembershipConfig, SessionConfig, StrongCertConfig, SudoConfig, + opaque::SessionKeys, AccountId, BabeConfig, BalancesConfig, CertConfig, GenesisConfig, + IdentityConfig, IdtyValue, ImOnlineId, MembershipConfig, SessionConfig, SudoConfig, SystemConfig, UdAccountsStorageConfig, UniversalDividendConfig, WASM_BINARY, }; use maplit::btreemap; @@ -122,7 +122,7 @@ fn devnet_genesis( }) .collect(), }, - strong_cert: StrongCertConfig { + cert: CertConfig { apply_cert_period_at_genesis: false, certs_by_issuer: clique_wot( initial_identities.len(), @@ -324,7 +324,7 @@ fn testnet_genesis( }) .collect(), }, - strong_cert: StrongCertConfig { + cert: CertConfig { apply_cert_period_at_genesis: false, certs_by_issuer: clique_wot( initial_identities.len(), diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs index cd1ead8840598dcb297b0a53f0930d9d2980b260..322ac1723408c6b584309cdd0329eeb447959ccd 100644 --- a/runtime/common/src/pallets_config.rs +++ b/runtime/common/src/pallets_config.rs @@ -234,7 +234,7 @@ macro_rules! pallets_config { type MinReceivedCertToBeAbleToIssueCert = MinReceivedCertToBeAbleToIssueCert; type OnNewcert = DuniterWot; type OnRemovedCert = DuniterWot; - type CertRenewablePeriod = StrongCertRenewablePeriod; + type CertRenewablePeriod = CertRenewablePeriod; type ValidityPeriod = ValidityPeriod; } diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs index 7eb458aae5b8d52437840d6a0655a40158ff87ef..a01f9216ec711fb71190cacaa9c52651dd39bca7 100644 --- a/runtime/g1/src/lib.rs +++ b/runtime/g1/src/lib.rs @@ -194,7 +194,7 @@ construct_runtime!( DuniterWot: pallet_duniter_wot::<Instance1>::{Pallet} = 50, Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 51, Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52, - StrongCert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53, + Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53, // Multisig dispatch. Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 60, diff --git a/runtime/g1/src/parameters.rs b/runtime/g1/src/parameters.rs index 7dc6b2b5baf24245fb379aa00fee82f2eb434ffd..a3326f3487ce692578c274245c5fac6a75cc9384 100644 --- a/runtime/g1/src/parameters.rs +++ b/runtime/g1/src/parameters.rs @@ -121,7 +121,7 @@ pub const MIN_STRONG_CERT_FOR_STRONG_CERT: u32 = 5; parameter_types! { pub const CertPeriod: BlockNumber = 5 * DAYS; pub const MaxByIssuer: u8 = 100; - pub const StrongCertRenewablePeriod: BlockNumber = 6 * MONTHS; + pub const CertRenewablePeriod: BlockNumber = 6 * MONTHS; pub const ValidityPeriod: BlockNumber = 2 * YEARS; } diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs index bfe577f5a34b00abe2bd9d5df90c03ee1aa282da..29a570f0410cb8cc5dae20c0841ead64076e1686 100644 --- a/runtime/gdev/src/lib.rs +++ b/runtime/gdev/src/lib.rs @@ -144,7 +144,7 @@ common_runtime::pallets_config! { // Dynamic parameters pub type CertPeriod = pallet_duniter_test_parameters::CertPeriod<Runtime>; pub type MaxByIssuer = pallet_duniter_test_parameters::CertMaxByIssuer<Runtime>; - pub type StrongCertRenewablePeriod = pallet_duniter_test_parameters::CertRenewablePeriod<Runtime>; + pub type CertRenewablePeriod = pallet_duniter_test_parameters::CertRenewablePeriod<Runtime>; 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>; @@ -205,7 +205,7 @@ construct_runtime!( DuniterWot: pallet_duniter_wot::<Instance1>::{Pallet} = 50, Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 51, Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52, - StrongCert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53, + Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53, // Multisig dispatch. Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 60, diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs index 80f7f0a4b3925ad3ce6b65664534a7490be9a711..db641384d70cd3bbd14e0f4feefbbaf2e836ed5d 100644 --- a/runtime/gtest/src/lib.rs +++ b/runtime/gtest/src/lib.rs @@ -194,7 +194,7 @@ construct_runtime!( DuniterWot: pallet_duniter_wot::<Instance1>::{Pallet} = 50, Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 51, Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52, - StrongCert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53, + Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53, // Multisig dispatch. Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 60, diff --git a/runtime/gtest/src/parameters.rs b/runtime/gtest/src/parameters.rs index eae9849b8cbe394d887a6ab7315ed2c44e20354b..b72844fcad881ffd4e032a6a884d57ef8ad0b7ed 100644 --- a/runtime/gtest/src/parameters.rs +++ b/runtime/gtest/src/parameters.rs @@ -119,7 +119,7 @@ pub const MIN_STRONG_CERT_FOR_STRONG_CERT: u32 = 5; parameter_types! { pub const CertPeriod: BlockNumber = DAYS; pub const MaxByIssuer: u8 = 100; - pub const StrongCertRenewablePeriod: BlockNumber = 12 * DAYS; + pub const CertRenewablePeriod: BlockNumber = 12 * DAYS; pub const ValidityPeriod: BlockNumber = 146 * DAYS; }