From 5b69670f359dc752cdd596e50a8ca45ba25b09a9 Mon Sep 17 00:00:00 2001
From: Hugo Trentesaux <hugo@trentesaux.fr>
Date: Tue, 2 May 2023 12:45:24 +0200
Subject: [PATCH] fix after rebase
duplicate functions
renamed smiths -> smith
---
node/src/chain_spec/gdev.rs | 32 +++----------------
pallets/identity/src/weights.rs | 6 ++--
runtime/common/src/pallets_config.rs | 2 +-
runtime/common/src/weights.rs | 2 +-
....rs => pallet_certification_smith_cert.rs} | 4 +--
runtime/common/src/weights/pallet_identity.rs | 6 ++--
6 files changed, 15 insertions(+), 37 deletions(-)
rename runtime/common/src/weights/{pallet_certification_smiths_cert.rs => pallet_certification_smith_cert.rs} (97%)
diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs
index 015813f1b..d2e91b276 100644
--- a/node/src/chain_spec/gdev.rs
+++ b/node/src/chain_spec/gdev.rs
@@ -565,8 +565,8 @@ fn gen_genesis_for_benchmark_chain(
smith_cert_validity_period,
smith_membership_period,
smith_pending_membership_period: 500,
- smiths_wot_first_cert_issuable_on: 20,
- smiths_wot_min_cert_for_membership: 2,
+ smith_wot_first_cert_issuable_on: 20,
+ smith_wot_min_cert_for_membership: 2,
wot_first_cert_issuable_on: 20,
wot_min_cert_for_create_idty_right: 2,
wot_min_cert_for_membership: 2,
@@ -580,9 +580,7 @@ fn gen_genesis_for_benchmark_chain(
.map(|(i, keys)| (i as u32 + 1, (keys.0.clone(), i < initial_authorities_len)))
.collect(),
},
- balances: BalancesConfig {
- balances: Default::default(),
- },
+ balances: Default::default(),
babe: BabeConfig {
authorities: Vec::with_capacity(0),
epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
@@ -662,12 +660,12 @@ fn gen_genesis_for_benchmark_chain(
apply_cert_period_at_genesis: false,
certs_by_receiver: clique_wot(initial_identities.len()),
},
- smiths_membership: SmithsMembershipConfig {
+ smith_membership: SmithMembershipConfig {
memberships: (1..=initial_smiths_len)
.map(|i| (i as u32, MembershipData { expire_on: 0 }))
.collect(),
},
- smiths_cert: SmithsCertConfig {
+ smith_cert: SmithCertConfig {
apply_cert_period_at_genesis: false,
certs_by_receiver: clique_wot(initial_smiths_len),
},
@@ -680,26 +678,6 @@ fn gen_genesis_for_benchmark_chain(
}
}
-fn get_env_u32(env_var_name: &'static str, default_value: u32) -> u32 {
- std::env::var(env_var_name)
- .map_or(Ok(default_value), |s| s.parse())
- .unwrap_or_else(|_| panic!("{} must be a number", env_var_name))
-}
-
-fn session_keys(
- babe: BabeId,
- grandpa: GrandpaId,
- im_online: ImOnlineId,
- authority_discovery: AuthorityDiscoveryId,
-) -> SessionKeys {
- SessionKeys {
- babe,
- grandpa,
- im_online,
- authority_discovery,
- }
-}
-
/// custom genesis
fn genesis_data_to_gdev_genesis_conf(
genesis_data: super::gen_genesis_data::GenesisData<GenesisParameters, SessionKeys>,
diff --git a/pallets/identity/src/weights.rs b/pallets/identity/src/weights.rs
index 070acc16b..14ef8a951 100644
--- a/pallets/identity/src/weights.rs
+++ b/pallets/identity/src/weights.rs
@@ -77,7 +77,7 @@ impl WeightInfo for () {
}
// Storage: Identity IdentityIndexOf (r:2 w:2)
// Storage: Identity Identities (r:1 w:1)
- // Storage: SmithsMembership Membership (r:1 w:0)
+ // Storage: SmithMembership Membership (r:1 w:0)
// Storage: System BlockHash (r:1 w:0)
// Storage: System Account (r:1 w:1)
// Storage: AuthorityMembers Members (r:1 w:0)
@@ -88,7 +88,7 @@ impl WeightInfo for () {
.saturating_add(RocksDbWeight::get().writes(4 as u64))
}
// Storage: Identity Identities (r:1 w:1)
- // Storage: SmithsMembership Membership (r:1 w:0)
+ // Storage: SmithMembership Membership (r:1 w:0)
// Storage: System BlockHash (r:1 w:0)
// Storage: Membership Membership (r:1 w:1)
// Storage: Identity CounterForIdentities (r:1 w:1)
@@ -104,7 +104,7 @@ impl WeightInfo for () {
.saturating_add(RocksDbWeight::get().writes(8 as u64))
}
// Storage: Identity Identities (r:1 w:1)
- // Storage: SmithsMembership Membership (r:1 w:0)
+ // Storage: SmithMembership Membership (r:1 w:0)
// Storage: Membership Membership (r:1 w:1)
// Storage: Identity CounterForIdentities (r:1 w:1)
// Storage: System Account (r:1 w:1)
diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs
index d618f0442..892cb3723 100644
--- a/runtime/common/src/pallets_config.rs
+++ b/runtime/common/src/pallets_config.rs
@@ -499,7 +499,7 @@ macro_rules! pallets_config {
type OnNewcert = SmithSubWot;
type OnRemovedCert = SmithSubWot;
type RuntimeEvent = RuntimeEvent;
- type WeightInfo = common_runtime::weights::pallet_certification_smiths_cert::WeightInfo<Runtime>;
+ type WeightInfo = common_runtime::weights::pallet_certification_smith_cert::WeightInfo<Runtime>;
type ValidityPeriod = SmithValidityPeriod;
}
diff --git a/runtime/common/src/weights.rs b/runtime/common/src/weights.rs
index f1e246952..b692cbca4 100644
--- a/runtime/common/src/weights.rs
+++ b/runtime/common/src/weights.rs
@@ -34,5 +34,5 @@ pub mod pallet_provide_randomness;
pub mod pallet_identity;
pub mod pallet_duniter_account;
pub mod pallet_certification_cert;
-pub mod pallet_certification_smiths_cert;
+pub mod pallet_certification_smith_cert;
pub mod paritydb_weights;
diff --git a/runtime/common/src/weights/pallet_certification_smiths_cert.rs b/runtime/common/src/weights/pallet_certification_smith_cert.rs
similarity index 97%
rename from runtime/common/src/weights/pallet_certification_smiths_cert.rs
rename to runtime/common/src/weights/pallet_certification_smith_cert.rs
index 0c7eab26f..52ec20435 100644
--- a/runtime/common/src/weights/pallet_certification_smiths_cert.rs
+++ b/runtime/common/src/weights/pallet_certification_smith_cert.rs
@@ -70,7 +70,7 @@ impl<T: frame_system::Config> pallet_certification::WeightInfo for WeightInfo<T>
// Storage: SmithsCert CertsByReceiver (r:1 w:1)
// Storage: SmithsCert StorageIdtyCertMeta (r:2 w:2)
// Storage: Parameters ParametersStorage (r:1 w:0)
- // Storage: SmithsMembership Membership (r:1 w:0)
+ // Storage: SmithMembership Membership (r:1 w:0)
fn del_cert() -> Weight {
// Minimum execution time: 126_824 nanoseconds.
Weight::from_ref_time(130_111_000 as u64)
@@ -80,7 +80,7 @@ impl<T: frame_system::Config> pallet_certification::WeightInfo for WeightInfo<T>
// Storage: SmithsCert CertsByReceiver (r:1 w:1)
// Storage: SmithsCert StorageIdtyCertMeta (r:2 w:2)
// Storage: Parameters ParametersStorage (r:1 w:0)
- // Storage: SmithsMembership Membership (r:1 w:0)
+ // Storage: SmithMembership Membership (r:1 w:0)
/// The range of component `i` is `[2, 1000]`.
/// The range of component `i` is `[2, 1000]`.
fn remove_all_certs_received_by(i: u32, ) -> Weight {
diff --git a/runtime/common/src/weights/pallet_identity.rs b/runtime/common/src/weights/pallet_identity.rs
index a76987ee2..8d398bb67 100644
--- a/runtime/common/src/weights/pallet_identity.rs
+++ b/runtime/common/src/weights/pallet_identity.rs
@@ -91,7 +91,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
}
// Storage: Identity IdentityIndexOf (r:2 w:2)
// Storage: Identity Identities (r:1 w:1)
- // Storage: SmithsMembership Membership (r:1 w:0)
+ // Storage: SmithMembership Membership (r:1 w:0)
// Storage: System BlockHash (r:1 w:0)
// Storage: System Account (r:1 w:1)
// Storage: AuthorityMembers Members (r:1 w:0)
@@ -102,7 +102,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().writes(4 as u64))
}
// Storage: Identity Identities (r:1 w:1)
- // Storage: SmithsMembership Membership (r:1 w:0)
+ // Storage: SmithMembership Membership (r:1 w:0)
// Storage: System BlockHash (r:1 w:0)
// Storage: Membership Membership (r:1 w:1)
// Storage: Identity CounterForIdentities (r:1 w:1)
@@ -118,7 +118,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().writes(8 as u64))
}
// Storage: Identity Identities (r:1 w:1)
- // Storage: SmithsMembership Membership (r:1 w:0)
+ // Storage: SmithMembership Membership (r:1 w:0)
// Storage: Membership Membership (r:1 w:1)
// Storage: Identity CounterForIdentities (r:1 w:1)
// Storage: System Account (r:1 w:1)
--
GitLab