From 3da34f0285acb5f223a93e94de2a2b1d3c68551e Mon Sep 17 00:00:00 2001
From: tuxmain <tuxmain@zettascript.org>
Date: Fri, 7 Apr 2023 18:06:26 +0200
Subject: [PATCH] style: rename smiths* to smith* almost everywhere
---
docs/api/runtime-calls.md | 8 +--
docs/user/smith.md | 6 +-
end2end-tests/cucumber-genesis/default.json | 4 +-
end2end-tests/cucumber-genesis/wot.json | 4 +-
node/src/chain_spec/gdev.rs | 24 +++----
node/src/chain_spec/gen_genesis_data.rs | 28 ++++-----
node/src/chain_spec/gtest.rs | 8 +--
pallets/duniter-test-parameters/src/lib.rs | 4 +-
pallets/duniter-wot/src/mock.rs | 70 ++++++++++-----------
pallets/duniter-wot/src/tests.rs | 14 ++---
resources/gdev.json | 4 +-
runtime/common/src/entities.rs | 6 +-
runtime/common/src/handlers.rs | 10 +--
runtime/common/src/pallets_config.rs | 20 +++---
runtime/g1/src/lib.rs | 10 +--
runtime/g1/src/parameters.rs | 4 +-
runtime/gdev/src/lib.rs | 18 +++---
runtime/gdev/tests/common/mod.rs | 10 +--
runtime/gdev/tests/integration_tests.rs | 2 +-
runtime/gtest/src/lib.rs | 10 +--
runtime/gtest/src/parameters.rs | 4 +-
xtask/src/gen_calls_doc.rs | 4 +-
22 files changed, 136 insertions(+), 136 deletions(-)
diff --git a/docs/api/runtime-calls.md b/docs/api/runtime-calls.md
index 42672b72f..2289d6262 100644
--- a/docs/api/runtime-calls.md
+++ b/docs/api/runtime-calls.md
@@ -683,7 +683,7 @@ Add a new certification or renew an existing one
The origin must be allow to certify.
-### SmithsMembership - 52
+### SmithMembership - 52
#### request_membership - 1
@@ -736,7 +736,7 @@ maybe_idty_id: Option<T::IdtyId>
revoke an active membership
(only available for sub wot, automatic for main wot)
-### SmithsCert - 53
+### SmithCert - 53
#### add_cert - 1
@@ -1693,7 +1693,7 @@ idty_index: T::IdtyIndex
remove all certifications received by an identity (only root)
-### SmithsMembership - 52
+### SmithMembership - 52
#### force_request_membership - 0
@@ -1708,7 +1708,7 @@ metadata: T::MetaData
request membership without checks
-### SmithsCert - 53
+### SmithCert - 53
#### force_add_cert - 0
diff --git a/docs/user/smith.md b/docs/user/smith.md
index 56afedaf2..7aff6714d 100644
--- a/docs/user/smith.md
+++ b/docs/user/smith.md
@@ -19,15 +19,15 @@ Only members of the smith WoT can author blocks. This WoT is a subset of the mai
3. Go to [a PolkadotJS web UI](https://polkadot.js.org/apps/?rpc=ws://127.0.0.1/ws:9945). (it's not the same thing as the browser extension)
- If using another port or address, change it accordingly in the left panel.
4. In the UI: developer > RPC call > author > rotateKeys() and copy the result in clipboard
-5. In the UI: developer > extrinsics > YOUR_SMITH_ACCOUNT > smithsMembership > requestMembership(metadata)
+5. In the UI: developer > extrinsics > YOUR_SMITH_ACCOUNT > smithMembership > requestMembership(metadata)
- add your p2p endpoint (optional)
- add your session keys
- send the query
6. Wait 48h to ensure your node keeps sync (**both** best **and** finalized block numbers must increase every 6s)
7. Await at least 3 smith certifications. Members of the smith WoT can certify you with this extrinsic:
- - In the UI: developer > extrinsics > CERTIFIER_SMITH_ACCOUNT > smithsCert > addCert(receiver)
+ - In the UI: developer > extrinsics > CERTIFIER_SMITH_ACCOUNT > smithCert > addCert(receiver)
- This is not automatic, you can ask for certs on the forum or the Matrix chatroom.
-8. In the UI: developer > extrinsics > YOUR_SMITH_ACCOUNT > smithsMembership > claimMembership(maybe_idty_id)
+8. In the UI: developer > extrinsics > YOUR_SMITH_ACCOUNT > smithMembership > claimMembership(maybe_idty_id)
- maybe_idty_id can be left empty since your identity id will be infered from your account address.
All extrinsics can be sent while connected to any Duniter node, but the RPC calls need a direct connection to your server. As some RPC calls should not be publicly callable for security reasons, the only ways to call them is from the server localhost or using an SSH bridge or other kind of secure tunnel.
diff --git a/end2end-tests/cucumber-genesis/default.json b/end2end-tests/cucumber-genesis/default.json
index ace113862..90f83b575 100644
--- a/end2end-tests/cucumber-genesis/default.json
+++ b/end2end-tests/cucumber-genesis/default.json
@@ -44,8 +44,8 @@
"smith_cert_validity_period": 1000,
"smith_membership_period": 1000,
"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
diff --git a/end2end-tests/cucumber-genesis/wot.json b/end2end-tests/cucumber-genesis/wot.json
index 9640372aa..e49e2ed63 100644
--- a/end2end-tests/cucumber-genesis/wot.json
+++ b/end2end-tests/cucumber-genesis/wot.json
@@ -47,8 +47,8 @@
"smith_cert_validity_period": 1000,
"smith_membership_period": 1000,
"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
diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs
index 6bbb5b65b..b83bfa370 100644
--- a/node/src/chain_spec/gdev.rs
+++ b/node/src/chain_spec/gdev.rs
@@ -21,7 +21,7 @@ use common_runtime::*;
use gdev_runtime::{
opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig, CertConfig,
GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig, ParametersConfig, SessionConfig,
- SmithsCertConfig, SmithsMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
+ SmithCertConfig, SmithMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
UniversalDividendConfig, WASM_BINARY,
};
use sc_service::ChainType;
@@ -150,7 +150,7 @@ pub fn development_chain_spec() -> Result<ChainSpec, String> {
wasm_binary,
// Initial authorities len
1,
- // Initial smiths members len
+ // Initial smith members len
3,
// Inital identities len
4,
@@ -353,8 +353,8 @@ fn gen_genesis_for_local_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,
@@ -425,12 +425,12 @@ fn gen_genesis_for_local_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),
},
@@ -459,8 +459,8 @@ fn genesis_data_to_gdev_genesis_conf(
memberships,
parameters,
session_keys_map,
- smiths_certs_by_receiver,
- smiths_memberships,
+ smith_certs_by_receiver,
+ smith_memberships,
sudo_key,
technical_committee_members,
} = genesis_data;
@@ -517,12 +517,12 @@ fn genesis_data_to_gdev_genesis_conf(
certs_by_receiver,
},
membership: MembershipConfig { memberships },
- smiths_cert: SmithsCertConfig {
+ smith_cert: SmithCertConfig {
apply_cert_period_at_genesis: true,
- certs_by_receiver: smiths_certs_by_receiver,
+ certs_by_receiver: smith_certs_by_receiver,
},
- smiths_membership: SmithsMembershipConfig {
- memberships: smiths_memberships,
+ smith_membership: SmithMembershipConfig {
+ memberships: smith_memberships,
},
universal_dividend: UniversalDividendConfig {
first_reeval: first_ud_reeval,
diff --git a/node/src/chain_spec/gen_genesis_data.rs b/node/src/chain_spec/gen_genesis_data.rs
index 21ada90c3..5e0736824 100644
--- a/node/src/chain_spec/gen_genesis_data.rs
+++ b/node/src/chain_spec/gen_genesis_data.rs
@@ -35,8 +35,8 @@ pub struct GenesisData<Parameters: DeserializeOwned, SessionKeys: Decode> {
pub memberships: BTreeMap<u32, MembershipData>,
pub parameters: Parameters,
pub session_keys_map: BTreeMap<AccountId, SessionKeys>,
- pub smiths_certs_by_receiver: BTreeMap<u32, BTreeMap<u32, Option<u32>>>,
- pub smiths_memberships: BTreeMap<u32, MembershipData>,
+ pub smith_certs_by_receiver: BTreeMap<u32, BTreeMap<u32, Option<u32>>>,
+ pub smith_memberships: BTreeMap<u32, MembershipData>,
pub sudo_key: Option<AccountId>,
pub technical_committee_members: Vec<AccountId>,
}
@@ -271,8 +271,8 @@ where
let mut initial_authorities = BTreeMap::new();
let mut online_authorities_counter = 0;
let mut session_keys_map = BTreeMap::new();
- let mut smiths_memberships = BTreeMap::new();
- let mut smiths_certs_by_receiver = BTreeMap::new();
+ let mut smith_memberships = BTreeMap::new();
+ let mut smith_certs_by_receiver = BTreeMap::new();
for (idty_name, smith_data) in smith_identities {
let idty_index = idty_index_of
.get(&idty_name)
@@ -336,10 +336,10 @@ where
.ok_or(format!("Identity '{}' not exist", issuer))?;
receiver_certs.insert(*issuer_index, maybe_expire_on);
}
- smiths_certs_by_receiver.insert(*idty_index, receiver_certs);
+ smith_certs_by_receiver.insert(*idty_index, receiver_certs);
// Memberships
- smiths_memberships.insert(
+ smith_memberships.insert(
*idty_index,
MembershipData {
expire_on: genesis_smith_memberships_expire_on,
@@ -347,17 +347,17 @@ where
);
}
- // Verify smiths certifications coherence
- if smiths_certs_by_receiver.len() < smiths_memberships.len() {
+ // Verify smith certifications coherence
+ if smith_certs_by_receiver.len() < smith_memberships.len() {
return Err(format!(
- "{} smith identities has not received any smiths certifications",
- smiths_memberships.len() - smiths_certs_by_receiver.len()
+ "{} smith identities have not received any smith certification",
+ smith_memberships.len() - smith_certs_by_receiver.len()
));
}
- for (idty_index, receiver_certs) in &smiths_certs_by_receiver {
+ for (idty_index, receiver_certs) in &smith_certs_by_receiver {
if receiver_certs.len() < genesis_smith_certs_min_received as usize {
return Err(format!(
- "Identity n°{} has received only {}/{} smiths certifications)",
+ "Identity n°{} has received only {}/{} smith certifications)",
idty_index,
receiver_certs.len(),
genesis_smith_certs_min_received
@@ -380,8 +380,8 @@ where
memberships,
parameters,
session_keys_map,
- smiths_certs_by_receiver,
- smiths_memberships,
+ smith_certs_by_receiver,
+ smith_memberships,
sudo_key,
technical_committee_members,
};
diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs
index ac1b0b1a9..180dce2b2 100644
--- a/node/src/chain_spec/gtest.rs
+++ b/node/src/chain_spec/gtest.rs
@@ -21,7 +21,7 @@ use common_runtime::*;
use gtest_runtime::{
opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig,
BalancesConfig, CertConfig, GenesisConfig, IdentityConfig, IdtyValue, ImOnlineId,
- MembershipConfig, SessionConfig, SmithsCertConfig, SmithsMembershipConfig, SudoConfig,
+ MembershipConfig, SessionConfig, SmithCertConfig, SmithMembershipConfig, SudoConfig,
SystemConfig, TechnicalCommitteeConfig, UniversalDividendConfig, WASM_BINARY,
};
use sc_service::ChainType;
@@ -72,7 +72,7 @@ pub fn development_chain_spec() -> Result<ChainSpec, String> {
wasm_binary,
// Initial authorities len
1,
- // Initial smiths members len
+ // Initial smith members len
3,
// Inital identities len
4,
@@ -275,7 +275,7 @@ fn gen_genesis_for_local_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| {
(
@@ -287,7 +287,7 @@ fn gen_genesis_for_local_chain(
})
.collect(),
},
- smiths_cert: SmithsCertConfig {
+ smith_cert: SmithCertConfig {
apply_cert_period_at_genesis: false,
certs_by_receiver: clique_wot(initial_smiths_len),
},
diff --git a/pallets/duniter-test-parameters/src/lib.rs b/pallets/duniter-test-parameters/src/lib.rs
index a63e97654..908bc7fe7 100644
--- a/pallets/duniter-test-parameters/src/lib.rs
+++ b/pallets/duniter-test-parameters/src/lib.rs
@@ -53,8 +53,8 @@ pub mod types {
pub smith_cert_validity_period: BlockNumber,
pub smith_membership_period: BlockNumber,
pub smith_pending_membership_period: BlockNumber,
- pub smiths_wot_first_cert_issuable_on: BlockNumber,
- pub smiths_wot_min_cert_for_membership: CertCount,
+ pub smith_wot_first_cert_issuable_on: BlockNumber,
+ pub smith_wot_min_cert_for_membership: CertCount,
pub wot_first_cert_issuable_on: BlockNumber,
pub wot_min_cert_for_create_idty_right: CertCount,
pub wot_min_cert_for_membership: CertCount,
diff --git a/pallets/duniter-wot/src/mock.rs b/pallets/duniter-wot/src/mock.rs
index 06226d5b4..d38335252 100644
--- a/pallets/duniter-wot/src/mock.rs
+++ b/pallets/duniter-wot/src/mock.rs
@@ -50,9 +50,9 @@ frame_support::construct_runtime!(
Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>},
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>},
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>},
- SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet},
- SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>},
- SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>},
+ SmithSubWot: pallet_duniter_wot::<Instance2>::{Pallet},
+ SmithMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>},
+ SmithCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>},
}
);
@@ -121,7 +121,7 @@ impl pallet_identity::traits::IdtyNameValidator for IdtyNameValidatorTestImpl {
impl pallet_identity::Config for Test {
type ChangeOwnerKeyPeriod = ChangeOwnerKeyPeriod;
type ConfirmPeriod = ConfirmPeriod;
- type CheckIdtyCallAllowed = (DuniterWot, SmithsSubWot);
+ type CheckIdtyCallAllowed = (DuniterWot, SmithSubWot);
type IdtyCreationPeriod = IdtyCreationPeriod;
type IdtyData = ();
type IdtyNameValidator = IdtyNameValidatorTestImpl;
@@ -177,54 +177,54 @@ impl pallet_certification::Config<Instance1> for Test {
// SMITHS SUB-WOT //
parameter_types! {
- pub const SmithsMinCertForMembership: u32 = 2;
- pub const SmithsFirstIssuableOn: u64 = 2;
+ pub const SmithMinCertForMembership: u32 = 2;
+ pub const SmithFirstIssuableOn: u64 = 2;
}
impl pallet_duniter_wot::Config<Instance2> for Test {
type IsSubWot = frame_support::traits::ConstBool<true>;
- type MinCertForMembership = SmithsMinCertForMembership;
+ type MinCertForMembership = SmithMinCertForMembership;
type MinCertForCreateIdtyRight = frame_support::traits::ConstU32<0>;
- type FirstIssuableOn = SmithsFirstIssuableOn;
+ type FirstIssuableOn = SmithFirstIssuableOn;
}
-// SmithsMembership
+// SmithMembership
parameter_types! {
- pub const SmithsMembershipPeriod: u64 = 20;
- pub const SmithsPendingMembershipPeriod: u64 = 3;
+ pub const SmithMembershipPeriod: u64 = 20;
+ pub const SmithPendingMembershipPeriod: u64 = 3;
}
impl pallet_membership::Config<Instance2> for Test {
- type CheckCallAllowed = SmithsSubWot;
+ type CheckCallAllowed = SmithSubWot;
type IdtyId = IdtyIndex;
type IdtyIdOf = IdentityIndexOf<Self>;
- type MembershipPeriod = SmithsMembershipPeriod;
+ type MembershipPeriod = SmithMembershipPeriod;
type MetaData = ();
- type OnEvent = SmithsSubWot;
- type PendingMembershipPeriod = SmithsPendingMembershipPeriod;
+ type OnEvent = SmithSubWot;
+ type PendingMembershipPeriod = SmithPendingMembershipPeriod;
type RuntimeEvent = RuntimeEvent;
}
-// SmithsCert
+// SmithCert
parameter_types! {
- pub const SmithsMaxByIssuer: u8 = 8;
- pub const SmithsMinReceivedCertToBeAbleToIssueCert: u32 = 2;
- pub const SmithsCertPeriod: u64 = 2;
- pub const SmithsValidityPeriod: u64 = 10;
+ pub const SmithMaxByIssuer: u8 = 8;
+ pub const SmithMinReceivedCertToBeAbleToIssueCert: u32 = 2;
+ pub const SmithCertPeriod: u64 = 2;
+ pub const SmithValidityPeriod: u64 = 10;
}
impl pallet_certification::Config<Instance2> for Test {
- type CertPeriod = SmithsCertPeriod;
+ type CertPeriod = SmithCertPeriod;
type IdtyIndex = IdtyIndex;
type OwnerKeyOf = Identity;
- type CheckCertAllowed = SmithsSubWot;
- type MaxByIssuer = SmithsMaxByIssuer;
- type MinReceivedCertToBeAbleToIssueCert = SmithsMinReceivedCertToBeAbleToIssueCert;
- type OnNewcert = SmithsSubWot;
- type OnRemovedCert = SmithsSubWot;
+ type CheckCertAllowed = SmithSubWot;
+ type MaxByIssuer = SmithMaxByIssuer;
+ type MinReceivedCertToBeAbleToIssueCert = SmithMinReceivedCertToBeAbleToIssueCert;
+ type OnNewcert = SmithSubWot;
+ type OnRemovedCert = SmithSubWot;
type RuntimeEvent = RuntimeEvent;
type WeightInfo = ();
- type ValidityPeriod = SmithsValidityPeriod;
+ type ValidityPeriod = SmithValidityPeriod;
}
pub const NAMES: [&str; 6] = ["Alice", "Bob", "Charlie", "Dave", "Eve", "Ferdie"];
@@ -285,7 +285,7 @@ pub fn new_test_ext(
(
i as u32,
sp_membership::MembershipData {
- expire_on: SmithsMembershipPeriod::get(),
+ expire_on: SmithMembershipPeriod::get(),
},
)
})
@@ -296,7 +296,7 @@ pub fn new_test_ext(
pallet_certification::GenesisConfig::<Test, Instance2> {
apply_cert_period_at_genesis: true,
- certs_by_receiver: clique_wot(initial_smiths_len, SmithsValidityPeriod::get()),
+ certs_by_receiver: clique_wot(initial_smiths_len, SmithValidityPeriod::get()),
}
.assimilate_storage(&mut t)
.unwrap();
@@ -321,9 +321,9 @@ pub fn run_to_block(n: u64) {
Identity::on_finalize(System::block_number());
Membership::on_finalize(System::block_number());
Cert::on_finalize(System::block_number());
- SmithsSubWot::on_finalize(System::block_number());
- SmithsMembership::on_finalize(System::block_number());
- SmithsCert::on_finalize(System::block_number());
+ SmithSubWot::on_finalize(System::block_number());
+ SmithMembership::on_finalize(System::block_number());
+ SmithCert::on_finalize(System::block_number());
System::on_finalize(System::block_number());
System::reset_events();
System::set_block_number(System::block_number() + 1);
@@ -332,9 +332,9 @@ pub fn run_to_block(n: u64) {
Identity::on_initialize(System::block_number());
Membership::on_initialize(System::block_number());
Cert::on_initialize(System::block_number());
- SmithsSubWot::on_initialize(System::block_number());
- SmithsMembership::on_initialize(System::block_number());
- SmithsCert::on_initialize(System::block_number());
+ SmithSubWot::on_initialize(System::block_number());
+ SmithMembership::on_initialize(System::block_number());
+ SmithCert::on_initialize(System::block_number());
}
}
diff --git a/pallets/duniter-wot/src/tests.rs b/pallets/duniter-wot/src/tests.rs
index e098da0a6..1f40cab21 100644
--- a/pallets/duniter-wot/src/tests.rs
+++ b/pallets/duniter-wot/src/tests.rs
@@ -61,29 +61,29 @@ fn test_join_smiths() {
run_to_block(2);
// Dave shoud be able to request smith membership
- assert_ok!(SmithsMembership::request_membership(
+ assert_ok!(SmithMembership::request_membership(
RuntimeOrigin::signed(4),
()
));
- System::assert_has_event(RuntimeEvent::SmithsMembership(
+ System::assert_has_event(RuntimeEvent::SmithMembership(
pallet_membership::Event::MembershipRequested(4),
));
// Then, Alice should be able to send a smith cert to Dave
run_to_block(3);
- assert_ok!(SmithsCert::add_cert(RuntimeOrigin::signed(1), 1, 4));
+ assert_ok!(SmithCert::add_cert(RuntimeOrigin::signed(1), 1, 4));
// Then, Bob should be able to send a smith cert to Dave
run_to_block(4);
- assert_ok!(SmithsCert::add_cert(RuntimeOrigin::signed(2), 2, 4));
+ assert_ok!(SmithCert::add_cert(RuntimeOrigin::signed(2), 2, 4));
// Then, Dave should be able to claim his membership
run_to_block(4);
- assert_ok!(SmithsMembership::claim_membership(
+ assert_ok!(SmithMembership::claim_membership(
RuntimeOrigin::signed(4),
Some(4)
));
- System::assert_has_event(RuntimeEvent::SmithsMembership(
+ System::assert_has_event(RuntimeEvent::SmithMembership(
pallet_membership::Event::MembershipAcquired(4),
));
});
@@ -94,7 +94,7 @@ fn test_smith_certs_expirations_should_revoke_smith_membership() {
new_test_ext(5, 3).execute_with(|| {
// After block #10, alice membership should be revoked due to smith certs expiration
run_to_block(10);
- System::assert_has_event(RuntimeEvent::SmithsMembership(
+ System::assert_has_event(RuntimeEvent::SmithMembership(
pallet_membership::Event::MembershipRevoked(1),
));
});
diff --git a/resources/gdev.json b/resources/gdev.json
index aa09f2d51..b2ec211ee 100644
--- a/resources/gdev.json
+++ b/resources/gdev.json
@@ -163,8 +163,8 @@
"smith_cert_validity_period": 2102400,
"smith_membership_period": 1051200,
"smith_pending_membership_period": 172800,
- "smiths_wot_first_cert_issuable_on": 14400,
- "smiths_wot_min_cert_for_membership": 3,
+ "smith_wot_first_cert_issuable_on": 14400,
+ "smith_wot_min_cert_for_membership": 3,
"wot_first_cert_issuable_on": 0,
"wot_min_cert_for_create_idty_right": 3,
"wot_min_cert_for_membership": 3
diff --git a/runtime/common/src/entities.rs b/runtime/common/src/entities.rs
index 5b328d843..a81dac008 100644
--- a/runtime/common/src/entities.rs
+++ b/runtime/common/src/entities.rs
@@ -101,18 +101,18 @@ impl sp_runtime::traits::Verify for NewOwnerKeySignature {
#[cfg_attr(feature = "std", derive(Deserialize, Serialize))]
#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo)]
-pub struct SmithsMembershipMetaData<SessionKeysWrapper> {
+pub struct SmithMembershipMetaData<SessionKeysWrapper> {
pub owner_key: AccountId,
pub p2p_endpoint: sp_runtime::RuntimeString,
pub session_keys: SessionKeysWrapper,
}
-impl<SessionKeysWrapper> Default for SmithsMembershipMetaData<SessionKeysWrapper> {
+impl<SessionKeysWrapper> Default for SmithMembershipMetaData<SessionKeysWrapper> {
fn default() -> Self {
unreachable!()
}
}
impl<SessionKeysWrapper> sp_membership::traits::Validate<AccountId>
- for SmithsMembershipMetaData<SessionKeysWrapper>
+ for SmithMembershipMetaData<SessionKeysWrapper>
{
fn validate(&self, who: &AccountId) -> bool {
&self.owner_key == who
diff --git a/runtime/common/src/handlers.rs b/runtime/common/src/handlers.rs
index 583e31e8e..2ea464a2f 100644
--- a/runtime/common/src/handlers.rs
+++ b/runtime/common/src/handlers.rs
@@ -111,27 +111,27 @@ pub struct OnSmithMembershipEventHandler<Inner, Runtime>(
impl<
IdtyIndex: Copy + Parameter,
SessionKeysWrapper: Clone,
- Inner: sp_membership::traits::OnEvent<IdtyIndex, SmithsMembershipMetaData<SessionKeysWrapper>>,
+ Inner: sp_membership::traits::OnEvent<IdtyIndex, SmithMembershipMetaData<SessionKeysWrapper>>,
Runtime: frame_system::Config<AccountId = AccountId>
+ pallet_identity::Config<IdtyIndex = IdtyIndex>
+ pallet_authority_members::Config<KeysWrapper = SessionKeysWrapper, MemberId = IdtyIndex>
+ pallet_membership::Config<
Instance2,
- MetaData = SmithsMembershipMetaData<SessionKeysWrapper>,
+ MetaData = SmithMembershipMetaData<SessionKeysWrapper>,
>,
- > sp_membership::traits::OnEvent<IdtyIndex, SmithsMembershipMetaData<SessionKeysWrapper>>
+ > sp_membership::traits::OnEvent<IdtyIndex, SmithMembershipMetaData<SessionKeysWrapper>>
for OnSmithMembershipEventHandler<Inner, Runtime>
{
fn on_event(
membership_event: &sp_membership::Event<
IdtyIndex,
- SmithsMembershipMetaData<SessionKeysWrapper>,
+ SmithMembershipMetaData<SessionKeysWrapper>,
>,
) -> Weight {
(match membership_event {
sp_membership::Event::MembershipAcquired(
_idty_index,
- SmithsMembershipMetaData {
+ SmithMembershipMetaData {
owner_key,
session_keys,
..
diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs
index 6c34a13ff..36306fa52 100644
--- a/runtime/common/src/pallets_config.rs
+++ b/runtime/common/src/pallets_config.rs
@@ -195,7 +195,7 @@ macro_rules! pallets_config {
}
impl pallet_authority_members::Config for Runtime {
type KeysWrapper = opaque::SessionKeysWrapper;
- type IsMember = SmithsMembership;
+ type IsMember = SmithMembership;
type OnNewSession = OnNewSessionHandler<Runtime>;
type OnRemovedMember = OnRemovedAuthorityMemberHandler<Runtime>;
type MemberId = IdtyIndex;
@@ -428,7 +428,7 @@ macro_rules! pallets_config {
impl pallet_identity::Config for Runtime {
type ChangeOwnerKeyPeriod = ChangeOwnerKeyPeriod;
type ConfirmPeriod = ConfirmPeriod;
- type CheckIdtyCallAllowed = (Wot, SmithsSubWot);
+ type CheckIdtyCallAllowed = (Wot, SmithSubWot);
type IdtyCreationPeriod = IdtyCreationPeriod;
type IdtyData = IdtyData;
type IdtyIndex = IdtyIndex;
@@ -471,19 +471,19 @@ macro_rules! pallets_config {
use frame_support::instances::Instance2;
impl pallet_duniter_wot::Config<Instance2> for Runtime {
- type FirstIssuableOn = SmithsWotFirstCertIssuableOn;
+ type FirstIssuableOn = SmithWotFirstCertIssuableOn;
type IsSubWot = frame_support::traits::ConstBool<true>;
- type MinCertForMembership = SmithsWotMinCertForMembership;
+ type MinCertForMembership = SmithWotMinCertForMembership;
type MinCertForCreateIdtyRight = frame_support::traits::ConstU32<0>;
}
impl pallet_membership::Config<Instance2> for Runtime {
- type CheckCallAllowed = SmithsSubWot;
+ type CheckCallAllowed = SmithSubWot;
type IdtyId = IdtyIndex;
type IdtyIdOf = common_runtime::providers::IdentityIndexOf<Self>;
type MembershipPeriod = SmithMembershipPeriod;
- type MetaData = SmithsMembershipMetaData<opaque::SessionKeysWrapper>;
- type OnEvent = OnSmithMembershipEventHandler<SmithsSubWot, Runtime>;
+ type MetaData = SmithMembershipMetaData<opaque::SessionKeysWrapper>;
+ type OnEvent = OnSmithMembershipEventHandler<SmithSubWot, Runtime>;
type PendingMembershipPeriod = SmithPendingMembershipPeriod;
type RuntimeEvent = RuntimeEvent;
}
@@ -492,11 +492,11 @@ macro_rules! pallets_config {
type CertPeriod = SmithCertPeriod;
type IdtyIndex = IdtyIndex;
type OwnerKeyOf = Identity;
- type CheckCertAllowed = SmithsSubWot;
+ type CheckCertAllowed = SmithSubWot;
type MaxByIssuer = SmithMaxByIssuer;
type MinReceivedCertToBeAbleToIssueCert = SmithMinReceivedCertToBeAbleToIssueCert;
- type OnNewcert = SmithsSubWot;
- type OnRemovedCert = SmithsSubWot;
+ type OnNewcert = SmithSubWot;
+ type OnRemovedCert = SmithSubWot;
type RuntimeEvent = RuntimeEvent;
type WeightInfo = common_runtime::weights::pallet_certification_smiths_cert::WeightInfo<Runtime>;
type ValidityPeriod = SmithValidityPeriod;
diff --git a/runtime/g1/src/lib.rs b/runtime/g1/src/lib.rs
index 6adcb4d57..e6cc61575 100644
--- a/runtime/g1/src/lib.rs
+++ b/runtime/g1/src/lib.rs
@@ -199,7 +199,7 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
// Some calls are never authorized from a proxied account
!matches!(
c,
- RuntimeCall::Cert(..) | RuntimeCall::Identity(..) | RuntimeCall::SmithsCert(..)
+ RuntimeCall::Cert(..) | RuntimeCall::Identity(..) | RuntimeCall::SmithCert(..)
)
}
ProxyType::TransferOnly => {
@@ -271,10 +271,10 @@ construct_runtime!(
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 42,
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 43,
- // Smiths Sub-Wot
- SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
- SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52,
- SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53,
+ // Smith Sub-Wot
+ SmithSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
+ SmithMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52,
+ SmithCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53,
// Utilities
AtomicSwap: pallet_atomic_swap::{Pallet, Call, Storage, Event<T>} = 60,
diff --git a/runtime/g1/src/parameters.rs b/runtime/g1/src/parameters.rs
index fc1340d13..354f52a43 100644
--- a/runtime/g1/src/parameters.rs
+++ b/runtime/g1/src/parameters.rs
@@ -121,8 +121,8 @@ parameter_types! {
/******************/
parameter_types! {
- pub const SmithsWotFirstCertIssuableOn: BlockNumber = 30 * DAYS;
- pub const SmithsWotMinCertForMembership: u32 = 3;
+ pub const SmithWotFirstCertIssuableOn: BlockNumber = 30 * DAYS;
+ pub const SmithWotMinCertForMembership: u32 = 3;
}
// Membership
diff --git a/runtime/gdev/src/lib.rs b/runtime/gdev/src/lib.rs
index 71f4bb92a..7d747fc52 100644
--- a/runtime/gdev/src/lib.rs
+++ b/runtime/gdev/src/lib.rs
@@ -229,7 +229,7 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
// Some calls are never authorized from a proxied account
!matches!(
c,
- RuntimeCall::Cert(..) | RuntimeCall::Identity(..) | RuntimeCall::SmithsCert(..)
+ RuntimeCall::Cert(..) | RuntimeCall::Identity(..) | RuntimeCall::SmithCert(..)
)
}
ProxyType::TransferOnly => {
@@ -284,10 +284,10 @@ common_runtime::pallets_config! {
pub type SmithMembershipPeriod = pallet_duniter_test_parameters::SmithMembershipPeriod<Runtime>;
pub type SmithPendingMembershipPeriod =
pallet_duniter_test_parameters::SmithPendingMembershipPeriod<Runtime>;
- pub type SmithsWotFirstCertIssuableOn =
- pallet_duniter_test_parameters::SmithsWotFirstCertIssuableOn<Runtime>;
- pub type SmithsWotMinCertForMembership =
- pallet_duniter_test_parameters::SmithsWotMinCertForMembership<Runtime>;
+ pub type SmithWotFirstCertIssuableOn =
+ pallet_duniter_test_parameters::SmithWotFirstCertIssuableOn<Runtime>;
+ pub type SmithWotMinCertForMembership =
+ pallet_duniter_test_parameters::SmithWotMinCertForMembership<Runtime>;
impl pallet_duniter_test_parameters::Config for Runtime {
type CertCount = u32;
@@ -349,10 +349,10 @@ construct_runtime!(
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 42,
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 43,
- // Smiths Sub-Wot
- SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
- SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52,
- SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53,
+ // Smith Sub-Wot
+ SmithSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
+ SmithMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52,
+ SmithCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53,
// Utilities
AtomicSwap: pallet_atomic_swap::{Pallet, Call, Storage, Event<T>} = 60,
diff --git a/runtime/gdev/tests/common/mod.rs b/runtime/gdev/tests/common/mod.rs
index 67278257c..60d0bd62d 100644
--- a/runtime/gdev/tests/common/mod.rs
+++ b/runtime/gdev/tests/common/mod.rs
@@ -112,8 +112,8 @@ impl ExtBuilder {
smith_cert_validity_period: 1_000,
smith_membership_period: 1_000,
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,
@@ -334,9 +334,9 @@ pub fn run_to_block(n: u32) {
Identity::on_initialize(System::block_number());
Membership::on_initialize(System::block_number());
Cert::on_initialize(System::block_number());
- SmithsSubWot::on_initialize(System::block_number());
- SmithsMembership::on_initialize(System::block_number());
- SmithsCert::on_initialize(System::block_number());
+ SmithSubWot::on_initialize(System::block_number());
+ SmithMembership::on_initialize(System::block_number());
+ SmithCert::on_initialize(System::block_number());
}
}
diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs
index a4068ebff..0588a74aa 100644
--- a/runtime/gdev/tests/integration_tests.rs
+++ b/runtime/gdev/tests/integration_tests.rs
@@ -158,7 +158,7 @@ fn test_remove_smith_identity() {
None
));
// Verify events
- System::assert_has_event(RuntimeEvent::SmithsMembership(
+ System::assert_has_event(RuntimeEvent::SmithMembership(
pallet_membership::Event::MembershipRevoked(3),
));
System::assert_has_event(RuntimeEvent::AuthorityMembers(
diff --git a/runtime/gtest/src/lib.rs b/runtime/gtest/src/lib.rs
index f859943c4..27d585905 100644
--- a/runtime/gtest/src/lib.rs
+++ b/runtime/gtest/src/lib.rs
@@ -200,7 +200,7 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
// Some calls are never authorized from a proxied account
!matches!(
c,
- RuntimeCall::Cert(..) | RuntimeCall::Identity(..) | RuntimeCall::SmithsCert(..)
+ RuntimeCall::Cert(..) | RuntimeCall::Identity(..) | RuntimeCall::SmithCert(..)
)
}
ProxyType::TransferOnly => {
@@ -272,10 +272,10 @@ construct_runtime!(
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 42,
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 43,
- // Smiths Sub-Wot
- SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
- SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52,
- SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53,
+ // Smith Sub-Wot
+ SmithSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
+ SmithMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52,
+ SmithCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53,
// Utilities
AtomicSwap: pallet_atomic_swap::{Pallet, Call, Storage, Event<T>} = 60,
diff --git a/runtime/gtest/src/parameters.rs b/runtime/gtest/src/parameters.rs
index 5e9aa2252..86b66d53a 100644
--- a/runtime/gtest/src/parameters.rs
+++ b/runtime/gtest/src/parameters.rs
@@ -121,8 +121,8 @@ parameter_types! {
/******************/
parameter_types! {
- pub const SmithsWotFirstCertIssuableOn: BlockNumber = DAYS;
- pub const SmithsWotMinCertForMembership: u32 = 3;
+ pub const SmithWotFirstCertIssuableOn: BlockNumber = DAYS;
+ pub const SmithWotMinCertForMembership: u32 = 3;
}
// Membership
diff --git a/xtask/src/gen_calls_doc.rs b/xtask/src/gen_calls_doc.rs
index 3307e8c20..775619e03 100644
--- a/xtask/src/gen_calls_doc.rs
+++ b/xtask/src/gen_calls_doc.rs
@@ -133,8 +133,8 @@ impl CallCategory {
Self::Disabled
}
("Cert", "force_add_cert" | "del_cert" | "remove_all_certs_received_by") => Self::Root,
- ("SmithsMembership", "force_request_membership") => Self::Root,
- ("SmithsCert", "force_add_cert" | "del_cert" | "remove_all_certs_received_by") => {
+ ("SmithMembership", "force_request_membership") => Self::Root,
+ ("SmithCert", "force_add_cert" | "del_cert" | "remove_all_certs_received_by") => {
Self::Root
}
("TechnicalCommittee", "set_members" | "disapprove_proposal") => Self::Root,
--
GitLab