Skip to content
Snippets Groups Projects
Unverified Commit dcbd60ca authored by bgallois's avatar bgallois
Browse files

fix #244

parent f7d5ad47
No related branches found
No related tags found
1 merge request!275Fix 244 coherence between identity next_schedule and membership expire_on
Show whitespace changes
Inline Side-by-side
Showing
with 29 additions and 24 deletions
node/src/chain_spec/g1.rs
+ 5
− 7
View file @ dcbd60ca
......@@ -147,7 +147,7 @@ fn genesis_data_to_g1_genesis_conf(
initial_monetary_mass,
memberships,
parameters: _,
common_parameters: _,
common_parameters,
session_keys_map,
initial_smiths,
sudo_key,
......@@ -191,7 +191,7 @@ fn genesis_data_to_g1_genesis_conf(
name,
owner_key,
status,
expires_on,
expires_on: _,
revokes_on,
}| GenesisIdty {
index: idty_index,
......@@ -205,11 +205,9 @@ fn genesis_data_to_g1_genesis_conf(
IdtyStatus::Unconfirmed | IdtyStatus::Unvalidated => {
panic!("Unconfirmed or Unvalidated identity in genesis")
}
IdtyStatus::Member => expires_on.expect("must have expires_on set"),
IdtyStatus::Revoked => 0,
IdtyStatus::NotMember => {
revokes_on.expect("must have revokes_on set")
}
IdtyStatus::Member => 0,
IdtyStatus::Revoked => common_parameters.as_ref().expect("must have common_parameters").identity_deletion_period,
IdtyStatus::NotMember => revokes_on.expect("must have revokes_on set"),
},
status,
},
......
node/src/chain_spec/gdev.rs
+ 7
− 8
View file @ dcbd60ca
......@@ -79,6 +79,7 @@ fn get_parameters(parameters_from_file: &Option<GenesisParameters>) -> CommonPar
identity_change_owner_key_period: parameters::ChangeOwnerKeyPeriod::get(),
identity_idty_creation_period: parameters_from_file.idty_creation_period,
identity_autorevocation_period: parameters::AutorevocationPeriod::get(),
identity_deletion_period: parameters::DeletionPeriod::get(),
membership_membership_period: parameters_from_file.membership_period,
membership_membership_renewal_period: parameters_from_file.membership_renewal_period,
cert_max_by_issuer: parameters_from_file.cert_max_by_issuer,
......@@ -231,7 +232,7 @@ fn genesis_data_to_gdev_genesis_conf(
initial_monetary_mass,
memberships,
parameters,
common_parameters: _,
common_parameters,
session_keys_map,
initial_smiths,
sudo_key,
......@@ -278,7 +279,7 @@ fn genesis_data_to_gdev_genesis_conf(
name,
owner_key,
status,
expires_on,
expires_on: _,
revokes_on,
}| GenesisIdty {
index: idty_index,
......@@ -290,13 +291,11 @@ fn genesis_data_to_gdev_genesis_conf(
owner_key,
next_scheduled: match status {
IdtyStatus::Unconfirmed | IdtyStatus::Unvalidated => {
panic!("Unconfirmed or Unvalidated identity in genesis")
}
IdtyStatus::Member => expires_on.expect("must have expires_on set"),
IdtyStatus::Revoked => 0,
IdtyStatus::NotMember => {
revokes_on.expect("must have revokes_on set")
panic!("Unconfirmed or Unvalidated or Revoked identity in genesis")
}
IdtyStatus::Member => 0,
IdtyStatus::Revoked => common_parameters.as_ref().expect("must have common_parameters").identity_deletion_period,
IdtyStatus::NotMember => revokes_on.expect("must have revokes_on set"),
},
status,
},
......
node/src/chain_spec/gen_genesis_data.rs
+ 9
− 1
View file @ dcbd60ca
......@@ -1759,7 +1759,14 @@ where
initial_authorities,
initial_monetary_mass: initial_identities_len as u64 * initial_idty_balance,
memberships: (1..=initial_identities.len())
.map(|i| (i as u32, MembershipData { expire_on: 0 }))
.map(|i| {
(
i as u32,
MembershipData {
expire_on: common_parameters.membership_membership_period,
},
)
})
.collect(),
parameters,
common_parameters: None,
......@@ -1935,6 +1942,7 @@ pub struct CommonParameters {
pub identity_change_owner_key_period: u32,
pub identity_idty_creation_period: u32,
pub identity_autorevocation_period: u32,
pub identity_deletion_period: u32,
pub membership_membership_period: u32,
pub membership_membership_renewal_period: u32,
pub cert_cert_period: u32,
......
node/src/chain_spec/gtest.rs
+ 5
− 7
View file @ dcbd60ca
......@@ -241,7 +241,7 @@ fn genesis_data_to_gtest_genesis_conf(
initial_monetary_mass,
memberships,
parameters: _,
common_parameters: _,
common_parameters,
session_keys_map,
initial_smiths,
sudo_key,
......@@ -285,7 +285,7 @@ fn genesis_data_to_gtest_genesis_conf(
name,
owner_key,
status,
expires_on,
expires_on: _,
revokes_on,
}| GenesisIdty {
index: idty_index,
......@@ -299,11 +299,9 @@ fn genesis_data_to_gtest_genesis_conf(
IdtyStatus::Unconfirmed | IdtyStatus::Unvalidated => {
panic!("Unconfirmed or Unvalidated identity in genesis")
}
IdtyStatus::Member => expires_on.expect("must have expires_on set"),
IdtyStatus::Revoked => 0,
IdtyStatus::NotMember => {
revokes_on.expect("must have revokes_on set")
}
IdtyStatus::Member => 0,
IdtyStatus::Revoked => common_parameters.as_ref().expect("must have common_parameters").identity_deletion_period,
IdtyStatus::NotMember => revokes_on.expect("must have revokes_on set"),
},
status,
},
......
runtime/common/src/pallets_config.rs
+ 0
− 1
View file @ dcbd60ca
......@@ -454,7 +454,6 @@ macro_rules! pallets_config {
parameter_types! {
pub const ValidationPeriod: BlockNumber = 2 * MONTHS;
pub const DeletionPeriod: BlockNumber = 10 * YEARS;
}
impl pallet_identity::Config for Runtime {
type AccountLinker = Account;
......
runtime/g1/src/parameters.rs
+ 1
− 0
View file @ dcbd60ca
......@@ -112,6 +112,7 @@ parameter_types! {
pub const IdtyCreationPeriod: BlockNumber = MONTHS;
pub const ValidationPeriod: BlockNumber = YEARS;
pub const AutorevocationPeriod: BlockNumber = YEARS;
pub const DeletionPeriod: BlockNumber = 10 * YEARS;
}
// Membership
......
runtime/gdev/src/parameters.rs
+ 1
− 0
View file @ dcbd60ca
......@@ -92,6 +92,7 @@ parameter_types! {
frame_support::parameter_types! {
pub const ChangeOwnerKeyPeriod: BlockNumber = 7 * DAYS;
pub const AutorevocationPeriod: BlockNumber = YEARS;
pub const DeletionPeriod: BlockNumber = 10 * YEARS;
}
// Membership
......
runtime/gtest/src/parameters.rs
+ 1
− 0
View file @ dcbd60ca
......@@ -105,6 +105,7 @@ parameter_types! {
pub const ConfirmPeriod: BlockNumber = DAYS;
pub const IdtyCreationPeriod: BlockNumber = DAYS;
pub const AutorevocationPeriod: BlockNumber = YEARS;
pub const DeletionPeriod: BlockNumber = 10 * YEARS;
}
// Membership
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment