difftreelog
feat(collator-selection) benchmarks for collator-selection and data-management + cargo fmt
in: master
21 files changed
Makefilediffbeforeafterboth--- a/Makefile
+++ b/Makefile
@@ -127,16 +127,16 @@
.PHONY: bench-foreign-assets
bench-foreign-assets:
- make _bench PALLET=foreign-assets
+ make _bench PALLET=foreign-assets
+
+.PHONY: bench-collator-selection
+bench-collator-selection:
+ make _bench PALLET=collator-selection
.PHONY: bench-app-promotion
bench-app-promotion:
make _bench PALLET=app-promotion PALLET_DIR=app-promotion
.PHONY: bench
-<<<<<<< HEAD
-bench: bench-data-management bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-scheduler bench-rmrk-core bench-rmrk-equip bench-foreign-assets
-=======
# Disabled: bench-scheduler, bench-rmrk-core, bench-rmrk-equip
-bench: bench-evm-migration bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-foreign-assets
->>>>>>> develop
+bench: bench-data-management bench-unique bench-structure bench-fungible bench-refungible bench-nonfungible bench-foreign-assets
pallets/collator-selection/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/benchmarking.rs
+++ b/pallets/collator-selection/src/benchmarking.rs
@@ -45,10 +45,15 @@
use frame_system::{EventRecord, RawOrigin};
use pallet_authorship::EventHandler;
use pallet_session::{self as session, SessionManager};
+use pallet_configuration::{
+ self as configuration, BalanceOf,
+ CollatorSelectionDesiredCollatorsOverride as DesiredCollators,
+ CollatorSelectionLicenseBondOverride as LicenseBond,
+};
use sp_std::prelude::*;
-pub type BalanceOf<T> =
- <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+/*pub type BalanceOf<T> =
+<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;*/
const SEED: u32 = 0;
@@ -111,7 +116,7 @@
validators.into_iter().map(|(who, _)| who).collect()
}
-fn register_candidates<T: Config>(count: u32) {
+fn register_candidates<T: Config + configuration::Config>(count: u32) {
let candidates = (0..count)
.map(|c| account("candidate", c, SEED))
.collect::<Vec<_>>();
@@ -122,27 +127,44 @@
for who in candidates {
T::Currency::make_free_balance_be(&who, <LicenseBond<T>>::get() * 2u32.into());
- <CollatorSelection<T>>::register_as_candidate(RawOrigin::Signed(who).into()).unwrap();
+ <CollatorSelection<T>>::get_license(RawOrigin::Signed(who.clone()).into()).unwrap();
+ <CollatorSelection<T>>::onboard(RawOrigin::Signed(who).into()).unwrap();
}
}
benchmarks! {
- where_clause { where T: pallet_authorship::Config + session::Config }
+ where_clause { where T: pallet_authorship::Config + session::Config + configuration::Config }
+
+ add_invulnerable {
+ let b in 1 .. T::MaxCollators::get();
+ let new_invulnerable = register_validators::<T>(b)[0].clone();
+ let origin = T::UpdateOrigin::successful_origin();
+ }: {
+ assert_ok!(
+ <CollatorSelection<T>>::add_invulnerable(origin, new_invulnerable.clone())
+ );
+ }
+ verify {
+ assert_last_event::<T>(Event::InvulnerableAdded{invulnerable: new_invulnerable}.into());
+ }
- set_invulnerables {
+ remove_invulnerable {
let b in 1 .. T::MaxCollators::get();
- let new_invulnerables = register_validators::<T>(b);
+ let new_invulnerable = register_validators::<T>(b)[0].clone();
let origin = T::UpdateOrigin::successful_origin();
+ assert_ok!(
+ <CollatorSelection<T>>::add_invulnerable(origin.clone(), new_invulnerable.clone())
+ );
}: {
assert_ok!(
- <CollatorSelection<T>>::set_invulnerables(origin, new_invulnerables.clone())
+ <CollatorSelection<T>>::remove_invulnerable(origin, new_invulnerable.clone())
);
}
verify {
- assert_last_event::<T>(Event::NewInvulnerables{invulnerables: new_invulnerables}.into());
+ assert_last_event::<T>(Event::InvulnerableRemoved{invulnerable: new_invulnerable}.into());
}
- set_desired_collators {
+ /*set_desired_collators {
let max: u32 = 999;
let origin = T::UpdateOrigin::successful_origin();
}: {
@@ -164,11 +186,9 @@
}
verify {
assert_last_event::<T>(Event::NewLicenseBond{bond_amount}.into());
- }
+ }*/
- // worse case is when we have all the max-candidate slots filled except one, and we fill that
- // one.
- register_as_candidate {
+ get_license {
let c in 1 .. T::MaxCollators::get();
<LicenseBond<T>>::put(T::Currency::minimum_balance());
@@ -189,27 +209,96 @@
}: _(RawOrigin::Signed(caller.clone()))
verify {
- assert_last_event::<T>(Event::CandidateAdded{account_id: caller, deposit: bond / 2u32.into()}.into());
+ assert_last_event::<T>(Event::LicenseObtained{account_id: caller, deposit: bond / 2u32.into()}.into());
}
- // worse case is the last candidate leaving.
- leave_intent {
- let c in (T::MinCandidates::get() + 1) .. T::MaxCollators::get();
+ // worst case is when we have all the max-candidate slots filled except one, and we fill that
+ // one.
+ onboard {
+ let c in 1 .. T::MaxCollators::get();
+
<LicenseBond<T>>::put(T::Currency::minimum_balance());
+ <DesiredCollators<T>>::put(c + 1);
+
+ register_validators::<T>(c);
+ register_candidates::<T>(c);
+
+ let caller: T::AccountId = whitelisted_caller();
+ let bond: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
+ T::Currency::make_free_balance_be(&caller, bond.clone());
+
+ let origin = RawOrigin::Signed(caller.clone());
+
+ <session::Pallet<T>>::set_keys(
+ origin.clone().into(),
+ keys::<T>(c + 1),
+ Vec::new()
+ ).unwrap();
+
+ assert_ok!(
+ <CollatorSelection<T>>::get_license(origin.clone().into())
+ );
+ }: _(origin)
+ verify {
+ assert_last_event::<T>(Event::CandidateAdded{account_id: caller}.into());
+ }
+
+ // worst case is the last candidate leaving.
+ offboard {
+ let c in 1 .. T::MaxCollators::get();
+ <LicenseBond<T>>::put(T::Currency::minimum_balance());
<DesiredCollators<T>>::put(c);
register_validators::<T>(c);
register_candidates::<T>(c);
- let leaving = <Candidates<T>>::get().last().unwrap().who.clone();
+ let leaving = <Candidates<T>>::get().last().unwrap().clone();
whitelist!(leaving);
}: _(RawOrigin::Signed(leaving.clone()))
verify {
- // todo:collator verify these
- assert_last_event::<T>(Event::CandidateRemoved{account_id: leaving, deposit_returned: bond / 2u32.into() }.into());
+ assert_last_event::<T>(Event::CandidateRemoved{account_id: leaving}.into());
}
- // worse case is paying a non-existing candidate account.
+ // worst case is the last candidate leaving.
+ release_license {
+ let c in 1 .. T::MaxCollators::get();
+ let bond = T::Currency::minimum_balance();
+ <LicenseBond<T>>::put(bond);
+ <DesiredCollators<T>>::put(c);
+
+ register_validators::<T>(c);
+ register_candidates::<T>(c);
+
+ let leaving = <Candidates<T>>::get().last().unwrap().clone();
+ whitelist!(leaving);
+ }: _(RawOrigin::Signed(leaving.clone()))
+ verify {
+ assert_last_event::<T>(Event::LicenseReleased{account_id: leaving, deposit_returned: bond}.into());
+ }
+
+ // worst case is the last candidate leaving.
+ force_release_license {
+ let c in 1 .. T::MaxCollators::get();
+ let bond = T::Currency::minimum_balance();
+ <LicenseBond<T>>::put(bond);
+ <DesiredCollators<T>>::put(c);
+
+ register_validators::<T>(c);
+ register_candidates::<T>(c);
+
+ let leaving = <Candidates<T>>::get().last().unwrap().clone();
+ whitelist!(leaving);
+ let origin = T::UpdateOrigin::successful_origin();
+ }: {
+ assert_ok!(
+ <CollatorSelection<T>>::force_release_license(origin, leaving.clone())
+ );
+ }
+ verify {
+ assert_last_event::<T>(Event::LicenseReleased{account_id: leaving, deposit_returned: bond}.into());
+ }
+
+ // worst case is paying a non-existing candidate account.
note_author {
<LicenseBond<T>>::put(T::Currency::minimum_balance());
T::Currency::make_free_balance_be(
@@ -247,16 +336,16 @@
let non_removals = c.saturating_sub(r);
for i in 0..c {
- <LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), zero_block);
+ <LastAuthoredBlock<T>>::insert(candidates[i as usize].clone(), zero_block);
}
if non_removals > 0 {
for i in 0..non_removals {
- <LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), new_block);
+ <LastAuthoredBlock<T>>::insert(candidates[i as usize].clone(), new_block);
}
} else {
for i in 0..c {
- <LastAuthoredBlock<T>>::insert(candidates[i as usize].who.clone(), new_block);
+ <LastAuthoredBlock<T>>::insert(candidates[i as usize].clone(), new_block);
}
}
@@ -268,10 +357,8 @@
}: {
<CollatorSelection<T> as SessionManager<_>>::new_session(0)
} verify {
- if c > r && non_removals >= T::MinCandidates::get() {
+ if c > r {
assert!(<Candidates<T>>::get().len() < pre_length);
- } else if c > r && non_removals < T::MinCandidates::get() {
- assert!(<Candidates<T>>::get().len() == T::MinCandidates::get() as usize);
} else {
assert!(<Candidates<T>>::get().len() == pre_length);
}
pallets/collator-selection/src/lib.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/lib.rs
+++ b/pallets/collator-selection/src/lib.rs
@@ -235,7 +235,7 @@
account_id: T::AccountId,
deposit: BalanceOf<T>,
},
- LicenseForfeited {
+ LicenseReleased {
account_id: T::AccountId,
deposit_returned: BalanceOf<T>,
},
@@ -285,7 +285,7 @@
impl<T: Config> Pallet<T> {
/// Add a collator to the list of invulnerable (fixed) collators.
#[pallet::call_index(0)]
- #[pallet::weight(T::WeightInfo::set_invulnerables(1u32))] // todo:collator weight
+ #[pallet::weight(T::WeightInfo::add_invulnerable(T::MaxCollators::get()))] // todo:collator weight
pub fn add_invulnerable(
origin: OriginFor<T>,
new: T::AccountId,
@@ -315,7 +315,7 @@
/// Remove a collator from the list of invulnerable (fixed) collators.
#[pallet::call_index(1)]
- #[pallet::weight(T::WeightInfo::set_invulnerables(1))] // todo:collator weight
+ #[pallet::weight(T::WeightInfo::remove_invulnerable(T::MaxCollators::get()))] // todo:collator weight
pub fn remove_invulnerable(
origin: OriginFor<T>,
who: T::AccountId,
@@ -344,7 +344,7 @@
///
/// This call is not available to `Invulnerable` collators.
#[pallet::call_index(2)]
- #[pallet::weight(T::WeightInfo::register_as_candidate(T::MaxCollators::get()))] // todo:collator weight
+ #[pallet::weight(T::WeightInfo::get_license(T::MaxCollators::get()))] // todo:collator weight
pub fn get_license(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
// register_as_candidate
let who = ensure_signed(origin)?;
@@ -377,7 +377,7 @@
///
/// This call is not available to `Invulnerable` collators.
#[pallet::call_index(3)]
- #[pallet::weight(T::WeightInfo::register_as_candidate(T::MaxCollators::get()))] // todo:collator weight
+ #[pallet::weight(T::WeightInfo::onboard(T::MaxCollators::get()))] // todo:collator weight
pub fn onboard(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
// register_as_candidate
let who = ensure_signed(origin)?;
@@ -417,33 +417,33 @@
})?;
Self::deposit_event(Event::CandidateAdded { account_id: who });
- Ok(Some(T::WeightInfo::register_as_candidate(current_count as u32)).into())
+ Ok(Some(T::WeightInfo::onboard(current_count as u32)).into())
}
/// Deregister `origin` as a collator candidate. Note that the collator can only leave on
/// session change. The license to `onboard` later at any other time will remain.
#[pallet::call_index(4)]
- #[pallet::weight(T::WeightInfo::leave_intent(T::MaxCollators::get()))] // todo:collator weight
+ #[pallet::weight(T::WeightInfo::offboard(T::MaxCollators::get()))] // todo:collator weight
pub fn offboard(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
// leave_intent
let who = ensure_signed(origin)?;
let current_count = Self::try_remove_candidate(&who)?;
- Ok(Some(T::WeightInfo::leave_intent(current_count as u32)).into()) // todo:collator weight
+ Ok(Some(T::WeightInfo::offboard(current_count as u32)).into()) // todo:collator weight
}
/// Forfeit `origin`'s own license. The `LicenseBond` will be unreserved immediately.
///
/// This call is not available to `Invulnerable` collators.
#[pallet::call_index(5)]
- #[pallet::weight(T::WeightInfo::leave_intent(T::MaxCollators::get()))] // todo:collator weight
+ #[pallet::weight(T::WeightInfo::release_license(T::MaxCollators::get()))] // todo:collator weight
pub fn release_license(origin: OriginFor<T>) -> DispatchResultWithPostInfo {
// leave_intent
let who = ensure_signed(origin)?;
let current_count = Self::try_remove_candidate_and_release_license(&who, false, true)?;
- Ok(Some(T::WeightInfo::leave_intent(current_count as u32)).into()) // todo:collator weight
+ Ok(Some(T::WeightInfo::release_license(current_count as u32)).into()) // todo:collator weight
}
/// Force deregister `origin` as a collator candidate as a governing authority, and revoke its license.
@@ -452,7 +452,7 @@
///
/// This call is, of course, not applicable to `Invulnerable` collators.
#[pallet::call_index(6)]
- #[pallet::weight(T::WeightInfo::leave_intent(T::MaxCollators::get()))] // todo:collator weight
+ #[pallet::weight(T::WeightInfo::force_release_license(T::MaxCollators::get()))] // todo:collator weight
pub fn force_release_license(
origin: OriginFor<T>,
who: T::AccountId,
@@ -462,7 +462,7 @@
let current_count = Self::try_remove_candidate_and_release_license(&who, false, true)?;
- Ok(Some(T::WeightInfo::leave_intent(current_count as u32)).into()) // todo:collator weight
+ Ok(Some(T::WeightInfo::force_release_license(current_count as u32)).into()) // todo:collator weight
}
}
@@ -534,7 +534,7 @@
Err(Error::<T>::NoLicense.into())
}
})?;
- Self::deposit_event(Event::LicenseForfeited {
+ Self::deposit_event(Event::LicenseReleased {
account_id: who.clone(),
deposit_returned,
});
pallets/collator-selection/src/weights.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/weights.rs
+++ b/pallets/collator-selection/src/weights.rs
@@ -44,11 +44,13 @@
// todo:collator re-generate weights
// The weight info trait for `pallet_collator_selection`.
pub trait WeightInfo {
- fn set_invulnerables(_b: u32) -> Weight;
- fn set_desired_collators() -> Weight;
- fn set_license_bond() -> Weight;
- fn register_as_candidate(_c: u32) -> Weight;
- fn leave_intent(_c: u32) -> Weight;
+ fn add_invulnerable(_b: u32) -> Weight;
+ fn remove_invulnerable(_b: u32) -> Weight;
+ fn get_license(_c: u32) -> Weight;
+ fn onboard(_c: u32) -> Weight;
+ fn offboard(_c: u32) -> Weight;
+ fn release_license(_c: u32) -> Weight;
+ fn force_release_license(_c: u32) -> Weight;
fn note_author() -> Weight;
fn new_session(_c: u32, _r: u32) -> Weight;
}
@@ -56,26 +58,47 @@
/// Weights for pallet_collator_selection using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
- fn set_invulnerables(b: u32) -> Weight {
+ fn add_invulnerable(b: u32) -> Weight {
Weight::from_ref_time(18_563_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(68_000 as u64).saturating_mul(b as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
- fn set_desired_collators() -> Weight {
- Weight::from_ref_time(16_363_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64))
+ fn remove_invulnerable(b: u32) -> Weight {
+ Weight::from_ref_time(18_563_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(68_000 as u64).saturating_mul(b as u64))
+ .saturating_add(T::DbWeight::get().writes(1 as u64))
}
- fn set_license_bond() -> Weight {
- Weight::from_ref_time(16_840_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64))
+ fn get_license(c: u32) -> Weight {
+ Weight::from_ref_time(71_196_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(198_000 as u64).saturating_mul(c as u64))
+ .saturating_add(T::DbWeight::get().reads(4 as u64))
+ .saturating_add(T::DbWeight::get().writes(2 as u64))
}
- fn register_as_candidate(c: u32) -> Weight {
+ fn onboard(c: u32) -> Weight {
Weight::from_ref_time(71_196_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(198_000 as u64).saturating_mul(c as u64))
.saturating_add(T::DbWeight::get().reads(4 as u64))
.saturating_add(T::DbWeight::get().writes(2 as u64))
}
- fn leave_intent(c: u32) -> Weight {
+ fn offboard(c: u32) -> Weight {
+ Weight::from_ref_time(55_336_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(151_000 as u64).saturating_mul(c as u64))
+ .saturating_add(T::DbWeight::get().reads(1 as u64))
+ .saturating_add(T::DbWeight::get().writes(2 as u64))
+ }
+ fn release_license(c: u32) -> Weight {
+ Weight::from_ref_time(55_336_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(151_000 as u64).saturating_mul(c as u64))
+ .saturating_add(T::DbWeight::get().reads(1 as u64))
+ .saturating_add(T::DbWeight::get().writes(2 as u64))
+ }
+ fn force_release_license(c: u32) -> Weight {
Weight::from_ref_time(55_336_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(151_000 as u64).saturating_mul(c as u64))
@@ -102,28 +125,47 @@
// For backwards compatibility and tests
impl WeightInfo for () {
- fn set_invulnerables(b: u32) -> Weight {
+ fn add_invulnerable(b: u32) -> Weight {
Weight::from_ref_time(18_563_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(68_000 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
- fn set_desired_collators() -> Weight {
- Weight::from_ref_time(16_363_000 as u64)
+ fn remove_invulnerable(b: u32) -> Weight {
+ Weight::from_ref_time(18_563_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(68_000 as u64).saturating_mul(b as u64))
.saturating_add(RocksDbWeight::get().writes(1 as u64))
}
- fn set_license_bond() -> Weight {
- Weight::from_ref_time(16_840_000 as u64)
- .saturating_add(RocksDbWeight::get().writes(1 as u64))
+ fn get_license(c: u32) -> Weight {
+ Weight::from_ref_time(71_196_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(198_000 as u64).saturating_mul(c as u64))
+ .saturating_add(RocksDbWeight::get().reads(4 as u64))
+ .saturating_add(RocksDbWeight::get().writes(2 as u64))
}
- fn register_as_candidate(c: u32) -> Weight {
+ fn onboard(c: u32) -> Weight {
Weight::from_ref_time(71_196_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(198_000 as u64).saturating_mul(c as u64))
.saturating_add(RocksDbWeight::get().reads(4 as u64))
.saturating_add(RocksDbWeight::get().writes(2 as u64))
}
- fn leave_intent(c: u32) -> Weight {
+ fn offboard(c: u32) -> Weight {
+ Weight::from_ref_time(55_336_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(151_000 as u64).saturating_mul(c as u64))
+ .saturating_add(RocksDbWeight::get().reads(1 as u64))
+ .saturating_add(RocksDbWeight::get().writes(2 as u64))
+ }
+ fn release_license(c: u32) -> Weight {
+ Weight::from_ref_time(55_336_000 as u64)
+ // Standard Error: 0
+ .saturating_add(Weight::from_ref_time(151_000 as u64).saturating_mul(c as u64))
+ .saturating_add(RocksDbWeight::get().reads(1 as u64))
+ .saturating_add(RocksDbWeight::get().writes(2 as u64))
+ }
+ fn force_release_license(c: u32) -> Weight {
Weight::from_ref_time(55_336_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(151_000 as u64).saturating_mul(c as u64))
pallets/data-management/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/data-management/src/benchmarking.rs
+++ b/pallets/data-management/src/benchmarking.rs
@@ -63,4 +63,28 @@
use codec::Encode;
let logs = (0..b).map(|_| <T as Config>::RuntimeEvent::from(crate::Event::<T>::TestEvent).encode()).collect::<Vec<_>>();
}: _(RawOrigin::Root, logs)
+
+ set_identities {
+ let b in 0..600;
+ use frame_benchmarking::account;
+ use pallet_identity::{BalanceOf, Registration, IdentityInfo};
+ let identities = (0..b).map(|i| (
+ account("caller", i, 0),
+ Some(Registration::<BalanceOf<T>, T::MaxRegistrars, T::MaxAdditionalFields> {
+ judgements: Default::default(),
+ deposit: Default::default(),
+ info: IdentityInfo {
+ additional: Default::default(),
+ display: Default::default(),
+ legal: Default::default(),
+ web: Default::default(),
+ riot: Default::default(),
+ email: Default::default(),
+ pgp_fingerprint: None,
+ image: Default::default(),
+ twitter: Default::default(),
+ },
+ }),
+ )).collect::<Vec<_>>();
+ }: _(RawOrigin::Root, identities)
}
pallets/data-management/src/lib.rsdiffbeforeafterboth--- a/pallets/data-management/src/lib.rs
+++ b/pallets/data-management/src/lib.rs
@@ -153,12 +153,18 @@
/// Insert or remove identities.
#[pallet::call_index(5)]
- #[pallet::weight(<SelfWeightOf<T>>::insert_events(identities.len() as u32))] // todo:collator weight
+ #[pallet::weight(<SelfWeightOf<T>>::set_identities(identities.len() as u32))] // todo:collator weight
pub fn set_identities(
origin: OriginFor<T>,
identities: Vec<(
T::AccountId,
- Option<Registration<pallet_identity::BalanceOf<T>, T::MaxRegistrars, T::MaxAdditionalFields>>,
+ Option<
+ Registration<
+ pallet_identity::BalanceOf<T>,
+ T::MaxRegistrars,
+ T::MaxAdditionalFields,
+ >,
+ >,
)>,
) -> DispatchResult {
ensure_root(origin)?;
pallets/data-management/src/weights.rsdiffbeforeafterboth--- a/pallets/data-management/src/weights.rs
+++ b/pallets/data-management/src/weights.rs
@@ -39,6 +39,7 @@
fn finish(b: u32, ) -> Weight;
fn insert_eth_logs(b: u32, ) -> Weight;
fn insert_events(b: u32, ) -> Weight;
+ fn set_identities(b: u32, ) -> Weight;
}
/// Weights for pallet_data_management using the Substrate node and recommended hardware.
@@ -80,6 +81,11 @@
// Standard Error: 1_227
.saturating_add(Weight::from_ref_time(1_311_481 as u64).saturating_mul(b as u64))
}
+ fn set_identities(b: u32, ) -> Weight {
+ Weight::from_ref_time(10_936_376 as u64)
+ // Standard Error: 1_227
+ .saturating_add(Weight::from_ref_time(1_311_481 as u64).saturating_mul(b as u64))
+ }
}
// For backwards compatibility and tests
@@ -120,4 +126,9 @@
// Standard Error: 1_227
.saturating_add(Weight::from_ref_time(1_311_481 as u64).saturating_mul(b as u64))
}
+ fn set_identities(b: u32, ) -> Weight {
+ Weight::from_ref_time(10_936_376 as u64)
+ // Standard Error: 1_227
+ .saturating_add(Weight::from_ref_time(1_311_481 as u64).saturating_mul(b as u64))
+ }
}
pallets/identity/src/benchmarking.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original license:18// This file is part of Substrate.1920// Copyright (C) 2020-2022 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435//! Identity pallet benchmarking.3637#![cfg(feature = "runtime-benchmarks")]3839use super::*;4041use crate::Pallet as Identity;42use frame_benchmarking::{account, benchmarks, whitelisted_caller};43use frame_support::{44 ensure,45 traits::{EnsureOrigin, Get},46};47use frame_system::RawOrigin;48use sp_runtime::traits::Bounded;4950const SEED: u32 = 0;5152fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {53 frame_system::Pallet::<T>::assert_last_event(generic_event.into());54}5556// Adds `r` registrars to the Identity Pallet. These registrars will have set fees and fields.57fn add_registrars<T: Config>(r: u32) -> Result<(), &'static str> {58 for i in 0..r {59 let registrar: T::AccountId = account("registrar", i, SEED);60 let registrar_lookup = T::Lookup::unlookup(registrar.clone());61 let _ = T::Currency::make_free_balance_be(®istrar, BalanceOf::<T>::max_value());62 let registrar_origin = T::RegistrarOrigin::successful_origin();63 Identity::<T>::add_registrar(registrar_origin, registrar_lookup)?;64 Identity::<T>::set_fee(RawOrigin::Signed(registrar.clone()).into(), i, 10u32.into())?;65 let fields =66 IdentityFields(67 IdentityField::Display |68 IdentityField::Legal | IdentityField::Web |69 IdentityField::Riot | IdentityField::Email |70 IdentityField::PgpFingerprint |71 IdentityField::Image | IdentityField::Twitter,72 );73 Identity::<T>::set_fields(RawOrigin::Signed(registrar.clone()).into(), i, fields)?;74 }7576 assert_eq!(Registrars::<T>::get().len(), r as usize);77 Ok(())78}7980// Create `s` sub-accounts for the identity of `who` and return them.81// Each will have 32 bytes of raw data added to it.82fn create_sub_accounts<T: Config>(83 who: &T::AccountId,84 s: u32,85) -> Result<Vec<(T::AccountId, Data)>, &'static str> {86 let mut subs = Vec::new();87 let who_origin = RawOrigin::Signed(who.clone());88 let data = Data::Raw(vec![0; 32].try_into().unwrap());8990 for i in 0..s {91 let sub_account = account("sub", i, SEED);92 subs.push((sub_account, data.clone()));93 }9495 // Set identity so `set_subs` does not fail.96 if IdentityOf::<T>::get(who).is_none() {97 let _ = T::Currency::make_free_balance_be(who, BalanceOf::<T>::max_value() / 2u32.into());98 let info = create_identity_info::<T>(1);99 Identity::<T>::set_identity(who_origin.into(), Box::new(info))?;100 }101102 Ok(subs)103}104105// Adds `s` sub-accounts to the identity of `who`. Each will have 32 bytes of raw data added to it.106// This additionally returns the vector of sub-accounts so it can be modified if needed.107fn add_sub_accounts<T: Config>(108 who: &T::AccountId,109 s: u32,110) -> Result<Vec<(T::AccountId, Data)>, &'static str> {111 let who_origin = RawOrigin::Signed(who.clone());112 let subs = create_sub_accounts::<T>(who, s)?;113114 Identity::<T>::set_subs(who_origin.into(), subs.clone())?;115116 Ok(subs)117}118119// This creates an `IdentityInfo` object with `num_fields` extra fields.120// All data is pre-populated with some arbitrary bytes.121fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo<T::MaxAdditionalFields> {122 let data = Data::Raw(vec![0; 32].try_into().unwrap());123124 IdentityInfo {125 additional: vec![(data.clone(), data.clone()); num_fields as usize].try_into().unwrap(),126 display: data.clone(),127 legal: data.clone(),128 web: data.clone(),129 riot: data.clone(),130 email: data.clone(),131 pgp_fingerprint: Some([0; 20]),132 image: data.clone(),133 twitter: data,134 }135}136137benchmarks! {138 add_registrar {139 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;140 ensure!(Registrars::<T>::get().len() as u32 == r, "Registrars not set up correctly.");141 let origin = T::RegistrarOrigin::successful_origin();142 let account = T::Lookup::unlookup(account("registrar", r + 1, SEED));143 }: _<T::RuntimeOrigin>(origin, account)144 verify {145 ensure!(Registrars::<T>::get().len() as u32 == r + 1, "Registrars not added.");146 }147148 set_identity {149 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;150 let x in 0 .. T::MaxAdditionalFields::get();151 let caller = {152 // The target user153 let caller: T::AccountId = whitelisted_caller();154 let caller_lookup = T::Lookup::unlookup(caller.clone());155 let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();156 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());157158 // Add an initial identity159 let initial_info = create_identity_info::<T>(1);160 Identity::<T>::set_identity(caller_origin.clone(), Box::new(initial_info.clone()))?;161162 // User requests judgement from all the registrars, and they approve163 for i in 0..r {164 let registrar: T::AccountId = account("registrar", i, SEED);165 let registrar_lookup = T::Lookup::unlookup(registrar.clone());166 let balance_to_use = T::Currency::minimum_balance() * 10u32.into();167 let _ = T::Currency::make_free_balance_be(®istrar, balance_to_use);168169 Identity::<T>::request_judgement(caller_origin.clone(), i, 10u32.into())?;170 Identity::<T>::provide_judgement(171 RawOrigin::Signed(registrar).into(),172 i,173 caller_lookup.clone(),174 Judgement::Reasonable,175 T::Hashing::hash_of(&initial_info),176 )?;177 }178 caller179 };180 }: _(RawOrigin::Signed(caller.clone()), Box::new(create_identity_info::<T>(x)))181 verify {182 assert_last_event::<T>(Event::<T>::IdentitySet { who: caller }.into());183 }184185 // We need to split `set_subs` into two benchmarks to accurately isolate the potential186 // writes caused by new or old sub accounts. The actual weight should simply be187 // the sum of these two weights.188 set_subs_new {189 let caller: T::AccountId = whitelisted_caller();190 // Create a new subs vec with s sub accounts191 let s in 0 .. T::MaxSubAccounts::get() => ();192 let subs = create_sub_accounts::<T>(&caller, s)?;193 ensure!(SubsOf::<T>::get(&caller).1.len() == 0, "Caller already has subs");194 }: set_subs(RawOrigin::Signed(caller.clone()), subs)195 verify {196 ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s, "Subs not added");197 }198199 set_subs_old {200 let caller: T::AccountId = whitelisted_caller();201 // Give them p many previous sub accounts.202 let p in 0 .. T::MaxSubAccounts::get() => {203 let _ = add_sub_accounts::<T>(&caller, p)?;204 };205 // Remove all subs.206 let subs = create_sub_accounts::<T>(&caller, 0)?;207 ensure!(208 SubsOf::<T>::get(&caller).1.len() as u32 == p,209 "Caller does have subs",210 );211 }: set_subs(RawOrigin::Signed(caller.clone()), subs)212 verify {213 ensure!(SubsOf::<T>::get(&caller).1.len() == 0, "Subs not removed");214 }215216 clear_identity {217 let caller: T::AccountId = whitelisted_caller();218 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));219 let caller_lookup = <T::Lookup as StaticLookup>::unlookup(caller.clone());220 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());221222 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;223 let s in 0 .. T::MaxSubAccounts::get() => {224 // Give them s many sub accounts225 let caller: T::AccountId = whitelisted_caller();226 let _ = add_sub_accounts::<T>(&caller, s)?;227 };228 let x in 0 .. T::MaxAdditionalFields::get();229230 // Create their main identity with x additional fields231 let info = create_identity_info::<T>(x);232 let caller: T::AccountId = whitelisted_caller();233 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));234 Identity::<T>::set_identity(caller_origin.clone(), Box::new(info.clone()))?;235236 // User requests judgement from all the registrars, and they approve237 for i in 0..r {238 let registrar: T::AccountId = account("registrar", i, SEED);239 let balance_to_use = T::Currency::minimum_balance() * 10u32.into();240 let _ = T::Currency::make_free_balance_be(®istrar, balance_to_use);241242 Identity::<T>::request_judgement(caller_origin.clone(), i, 10u32.into())?;243 Identity::<T>::provide_judgement(244 RawOrigin::Signed(registrar).into(),245 i,246 caller_lookup.clone(),247 Judgement::Reasonable,248 T::Hashing::hash_of(&info),249 )?;250 }251 ensure!(IdentityOf::<T>::contains_key(&caller), "Identity does not exist.");252 }: _(RawOrigin::Signed(caller.clone()))253 verify {254 ensure!(!IdentityOf::<T>::contains_key(&caller), "Identity not cleared.");255 }256257 request_judgement {258 let caller: T::AccountId = whitelisted_caller();259 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());260261 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;262 let x in 0 .. T::MaxAdditionalFields::get() => {263 // Create their main identity with x additional fields264 let info = create_identity_info::<T>(x);265 let caller: T::AccountId = whitelisted_caller();266 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller));267 Identity::<T>::set_identity(caller_origin, Box::new(info))?;268 };269 }: _(RawOrigin::Signed(caller.clone()), r - 1, 10u32.into())270 verify {271 assert_last_event::<T>(Event::<T>::JudgementRequested { who: caller, registrar_index: r-1 }.into());272 }273274 cancel_request {275 let caller: T::AccountId = whitelisted_caller();276 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));277 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());278279 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;280 let x in 0 .. T::MaxAdditionalFields::get() => {281 // Create their main identity with x additional fields282 let info = create_identity_info::<T>(x);283 let caller: T::AccountId = whitelisted_caller();284 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller));285 Identity::<T>::set_identity(caller_origin, Box::new(info))?;286 };287288 Identity::<T>::request_judgement(caller_origin, r - 1, 10u32.into())?;289 }: _(RawOrigin::Signed(caller.clone()), r - 1)290 verify {291 assert_last_event::<T>(Event::<T>::JudgementUnrequested { who: caller, registrar_index: r-1 }.into());292 }293294 set_fee {295 let caller: T::AccountId = whitelisted_caller();296 let caller_lookup = T::Lookup::unlookup(caller.clone());297298 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;299300 let registrar_origin = T::RegistrarOrigin::successful_origin();301 Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;302 let registrars = Registrars::<T>::get();303 ensure!(registrars[r as usize].as_ref().unwrap().fee == 0u32.into(), "Fee already set.");304 }: _(RawOrigin::Signed(caller), r, 100u32.into())305 verify {306 let registrars = Registrars::<T>::get();307 ensure!(registrars[r as usize].as_ref().unwrap().fee == 100u32.into(), "Fee not changed.");308 }309310 set_account_id {311 let caller: T::AccountId = whitelisted_caller();312 let caller_lookup = T::Lookup::unlookup(caller.clone());313 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());314315 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;316317 let registrar_origin = T::RegistrarOrigin::successful_origin();318 Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;319 let registrars = Registrars::<T>::get();320 ensure!(registrars[r as usize].as_ref().unwrap().account == caller, "id not set.");321 let new_account = T::Lookup::unlookup(account("new", 0, SEED));322 }: _(RawOrigin::Signed(caller), r, new_account)323 verify {324 let registrars = Registrars::<T>::get();325 ensure!(registrars[r as usize].as_ref().unwrap().account == account("new", 0, SEED), "id not changed.");326 }327328 set_fields {329 let caller: T::AccountId = whitelisted_caller();330 let caller_lookup = T::Lookup::unlookup(caller.clone());331 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());332333 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;334335 let registrar_origin = T::RegistrarOrigin::successful_origin();336 Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;337 let fields = IdentityFields(338 IdentityField::Display | IdentityField::Legal | IdentityField::Web | IdentityField::Riot339 | IdentityField::Email | IdentityField::PgpFingerprint | IdentityField::Image | IdentityField::Twitter340 );341 let registrars = Registrars::<T>::get();342 ensure!(registrars[r as usize].as_ref().unwrap().fields == Default::default(), "fields already set.");343 }: _(RawOrigin::Signed(caller), r, fields)344 verify {345 let registrars = Registrars::<T>::get();346 ensure!(registrars[r as usize].as_ref().unwrap().fields != Default::default(), "fields not set.");347 }348349 provide_judgement {350 // The user351 let user: T::AccountId = account("user", r, SEED);352 let user_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(user.clone()));353 let user_lookup = <T::Lookup as StaticLookup>::unlookup(user.clone());354 let _ = T::Currency::make_free_balance_be(&user, BalanceOf::<T>::max_value());355356 let caller: T::AccountId = whitelisted_caller();357 let caller_lookup = T::Lookup::unlookup(caller.clone());358 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());359360 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;361 let x in 0 .. T::MaxAdditionalFields::get();362363 let info = create_identity_info::<T>(x);364 let info_hash = T::Hashing::hash_of(&info);365 Identity::<T>::set_identity(user_origin.clone(), Box::new(info))?;366367 let registrar_origin = T::RegistrarOrigin::successful_origin();368 Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;369 Identity::<T>::request_judgement(user_origin, r, 10u32.into())?;370 }: _(RawOrigin::Signed(caller), r, user_lookup, Judgement::Reasonable, info_hash)371 verify {372 assert_last_event::<T>(Event::<T>::JudgementGiven { target: user, registrar_index: r }.into())373 }374375 kill_identity {376 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;377 let s in 0 .. T::MaxSubAccounts::get();378 let x in 0 .. T::MaxAdditionalFields::get();379380 let target: T::AccountId = account("target", 0, SEED);381 let target_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(target.clone()).into();382 let target_lookup = T::Lookup::unlookup(target.clone());383 let _ = T::Currency::make_free_balance_be(&target, BalanceOf::<T>::max_value());384385 let info = create_identity_info::<T>(x);386 Identity::<T>::set_identity(target_origin.clone(), Box::new(info.clone()))?;387 let _ = add_sub_accounts::<T>(&target, s)?;388389 // User requests judgement from all the registrars, and they approve390 for i in 0..r {391 let registrar: T::AccountId = account("registrar", i, SEED);392 let balance_to_use = T::Currency::minimum_balance() * 10u32.into();393 let _ = T::Currency::make_free_balance_be(®istrar, balance_to_use);394395 Identity::<T>::request_judgement(target_origin.clone(), i, 10u32.into())?;396 Identity::<T>::provide_judgement(397 RawOrigin::Signed(registrar).into(),398 i,399 target_lookup.clone(),400 Judgement::Reasonable,401 T::Hashing::hash_of(&info),402 )?;403 }404 ensure!(IdentityOf::<T>::contains_key(&target), "Identity not set");405 let origin = T::ForceOrigin::successful_origin();406 }: _<T::RuntimeOrigin>(origin, target_lookup)407 verify {408 ensure!(!IdentityOf::<T>::contains_key(&target), "Identity not removed");409 }410411 add_sub {412 let s in 0 .. T::MaxSubAccounts::get() - 1;413414 let caller: T::AccountId = whitelisted_caller();415 let _ = add_sub_accounts::<T>(&caller, s)?;416 let sub = account("new_sub", 0, SEED);417 let data = Data::Raw(vec![0; 32].try_into().unwrap());418 ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s, "Subs not set.");419 }: _(RawOrigin::Signed(caller.clone()), T::Lookup::unlookup(sub), data)420 verify {421 ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s + 1, "Subs not added.");422 }423424 rename_sub {425 let s in 1 .. T::MaxSubAccounts::get();426427 let caller: T::AccountId = whitelisted_caller();428 let (sub, _) = add_sub_accounts::<T>(&caller, s)?.remove(0);429 let data = Data::Raw(vec![1; 32].try_into().unwrap());430 ensure!(SuperOf::<T>::get(&sub).unwrap().1 != data, "data already set");431 }: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()), data.clone())432 verify {433 ensure!(SuperOf::<T>::get(&sub).unwrap().1 == data, "data not set");434 }435436 remove_sub {437 let s in 1 .. T::MaxSubAccounts::get();438439 let caller: T::AccountId = whitelisted_caller();440 let (sub, _) = add_sub_accounts::<T>(&caller, s)?.remove(0);441 ensure!(SuperOf::<T>::contains_key(&sub), "Sub doesn't exists");442 }: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()))443 verify {444 ensure!(!SuperOf::<T>::contains_key(&sub), "Sub not removed");445 }446447 quit_sub {448 let s in 0 .. T::MaxSubAccounts::get() - 1;449450 let caller: T::AccountId = whitelisted_caller();451 let sup = account("super", 0, SEED);452 let _ = add_sub_accounts::<T>(&sup, s)?;453 let sup_origin = RawOrigin::Signed(sup).into();454 Identity::<T>::add_sub(sup_origin, T::Lookup::unlookup(caller.clone()), Data::Raw(vec![0; 32].try_into().unwrap()))?;455 ensure!(SuperOf::<T>::contains_key(&caller), "Sub doesn't exists");456 }: _(RawOrigin::Signed(caller.clone()))457 verify {458 ensure!(!SuperOf::<T>::contains_key(&caller), "Sub not removed");459 }460461 impl_benchmark_test_suite!(Identity, crate::tests::new_test_ext(), crate::tests::Test);462}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original license:18// This file is part of Substrate.1920// Copyright (C) 2020-2022 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435//! Identity pallet benchmarking.3637#![cfg(feature = "runtime-benchmarks")]3839use super::*;4041use crate::Pallet as Identity;42use frame_benchmarking::{account, benchmarks, whitelisted_caller};43use frame_support::{44 ensure,45 traits::{EnsureOrigin, Get},46};47use frame_system::RawOrigin;48use sp_runtime::traits::Bounded;4950const SEED: u32 = 0;5152fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {53 frame_system::Pallet::<T>::assert_last_event(generic_event.into());54}5556// Adds `r` registrars to the Identity Pallet. These registrars will have set fees and fields.57fn add_registrars<T: Config>(r: u32) -> Result<(), &'static str> {58 for i in 0..r {59 let registrar: T::AccountId = account("registrar", i, SEED);60 let registrar_lookup = T::Lookup::unlookup(registrar.clone());61 let _ = T::Currency::make_free_balance_be(®istrar, BalanceOf::<T>::max_value());62 let registrar_origin = T::RegistrarOrigin::successful_origin();63 Identity::<T>::add_registrar(registrar_origin, registrar_lookup)?;64 Identity::<T>::set_fee(RawOrigin::Signed(registrar.clone()).into(), i, 10u32.into())?;65 let fields = IdentityFields(66 IdentityField::Display67 | IdentityField::Legal68 | IdentityField::Web69 | IdentityField::Riot70 | IdentityField::Email71 | IdentityField::PgpFingerprint72 | IdentityField::Image73 | IdentityField::Twitter,74 );75 Identity::<T>::set_fields(RawOrigin::Signed(registrar.clone()).into(), i, fields)?;76 }7778 assert_eq!(Registrars::<T>::get().len(), r as usize);79 Ok(())80}8182// Create `s` sub-accounts for the identity of `who` and return them.83// Each will have 32 bytes of raw data added to it.84fn create_sub_accounts<T: Config>(85 who: &T::AccountId,86 s: u32,87) -> Result<Vec<(T::AccountId, Data)>, &'static str> {88 let mut subs = Vec::new();89 let who_origin = RawOrigin::Signed(who.clone());90 let data = Data::Raw(vec![0; 32].try_into().unwrap());9192 for i in 0..s {93 let sub_account = account("sub", i, SEED);94 subs.push((sub_account, data.clone()));95 }9697 // Set identity so `set_subs` does not fail.98 if IdentityOf::<T>::get(who).is_none() {99 let _ = T::Currency::make_free_balance_be(who, BalanceOf::<T>::max_value() / 2u32.into());100 let info = create_identity_info::<T>(1);101 Identity::<T>::set_identity(who_origin.into(), Box::new(info))?;102 }103104 Ok(subs)105}106107// Adds `s` sub-accounts to the identity of `who`. Each will have 32 bytes of raw data added to it.108// This additionally returns the vector of sub-accounts so it can be modified if needed.109fn add_sub_accounts<T: Config>(110 who: &T::AccountId,111 s: u32,112) -> Result<Vec<(T::AccountId, Data)>, &'static str> {113 let who_origin = RawOrigin::Signed(who.clone());114 let subs = create_sub_accounts::<T>(who, s)?;115116 Identity::<T>::set_subs(who_origin.into(), subs.clone())?;117118 Ok(subs)119}120121// This creates an `IdentityInfo` object with `num_fields` extra fields.122// All data is pre-populated with some arbitrary bytes.123fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo<T::MaxAdditionalFields> {124 let data = Data::Raw(vec![0; 32].try_into().unwrap());125126 IdentityInfo {127 additional: vec![(data.clone(), data.clone()); num_fields as usize]128 .try_into()129 .unwrap(),130 display: data.clone(),131 legal: data.clone(),132 web: data.clone(),133 riot: data.clone(),134 email: data.clone(),135 pgp_fingerprint: Some([0; 20]),136 image: data.clone(),137 twitter: data,138 }139}140141benchmarks! {142 add_registrar {143 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;144 ensure!(Registrars::<T>::get().len() as u32 == r, "Registrars not set up correctly.");145 let origin = T::RegistrarOrigin::successful_origin();146 let account = T::Lookup::unlookup(account("registrar", r + 1, SEED));147 }: _<T::RuntimeOrigin>(origin, account)148 verify {149 ensure!(Registrars::<T>::get().len() as u32 == r + 1, "Registrars not added.");150 }151152 set_identity {153 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;154 let x in 0 .. T::MaxAdditionalFields::get();155 let caller = {156 // The target user157 let caller: T::AccountId = whitelisted_caller();158 let caller_lookup = T::Lookup::unlookup(caller.clone());159 let caller_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();160 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());161162 // Add an initial identity163 let initial_info = create_identity_info::<T>(1);164 Identity::<T>::set_identity(caller_origin.clone(), Box::new(initial_info.clone()))?;165166 // User requests judgement from all the registrars, and they approve167 for i in 0..r {168 let registrar: T::AccountId = account("registrar", i, SEED);169 let registrar_lookup = T::Lookup::unlookup(registrar.clone());170 let balance_to_use = T::Currency::minimum_balance() * 10u32.into();171 let _ = T::Currency::make_free_balance_be(®istrar, balance_to_use);172173 Identity::<T>::request_judgement(caller_origin.clone(), i, 10u32.into())?;174 Identity::<T>::provide_judgement(175 RawOrigin::Signed(registrar).into(),176 i,177 caller_lookup.clone(),178 Judgement::Reasonable,179 T::Hashing::hash_of(&initial_info),180 )?;181 }182 caller183 };184 }: _(RawOrigin::Signed(caller.clone()), Box::new(create_identity_info::<T>(x)))185 verify {186 assert_last_event::<T>(Event::<T>::IdentitySet { who: caller }.into());187 }188189 // We need to split `set_subs` into two benchmarks to accurately isolate the potential190 // writes caused by new or old sub accounts. The actual weight should simply be191 // the sum of these two weights.192 set_subs_new {193 let caller: T::AccountId = whitelisted_caller();194 // Create a new subs vec with s sub accounts195 let s in 0 .. T::MaxSubAccounts::get() => ();196 let subs = create_sub_accounts::<T>(&caller, s)?;197 ensure!(SubsOf::<T>::get(&caller).1.len() == 0, "Caller already has subs");198 }: set_subs(RawOrigin::Signed(caller.clone()), subs)199 verify {200 ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s, "Subs not added");201 }202203 set_subs_old {204 let caller: T::AccountId = whitelisted_caller();205 // Give them p many previous sub accounts.206 let p in 0 .. T::MaxSubAccounts::get() => {207 let _ = add_sub_accounts::<T>(&caller, p)?;208 };209 // Remove all subs.210 let subs = create_sub_accounts::<T>(&caller, 0)?;211 ensure!(212 SubsOf::<T>::get(&caller).1.len() as u32 == p,213 "Caller does have subs",214 );215 }: set_subs(RawOrigin::Signed(caller.clone()), subs)216 verify {217 ensure!(SubsOf::<T>::get(&caller).1.len() == 0, "Subs not removed");218 }219220 clear_identity {221 let caller: T::AccountId = whitelisted_caller();222 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));223 let caller_lookup = <T::Lookup as StaticLookup>::unlookup(caller.clone());224 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());225226 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;227 let s in 0 .. T::MaxSubAccounts::get() => {228 // Give them s many sub accounts229 let caller: T::AccountId = whitelisted_caller();230 let _ = add_sub_accounts::<T>(&caller, s)?;231 };232 let x in 0 .. T::MaxAdditionalFields::get();233234 // Create their main identity with x additional fields235 let info = create_identity_info::<T>(x);236 let caller: T::AccountId = whitelisted_caller();237 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));238 Identity::<T>::set_identity(caller_origin.clone(), Box::new(info.clone()))?;239240 // User requests judgement from all the registrars, and they approve241 for i in 0..r {242 let registrar: T::AccountId = account("registrar", i, SEED);243 let balance_to_use = T::Currency::minimum_balance() * 10u32.into();244 let _ = T::Currency::make_free_balance_be(®istrar, balance_to_use);245246 Identity::<T>::request_judgement(caller_origin.clone(), i, 10u32.into())?;247 Identity::<T>::provide_judgement(248 RawOrigin::Signed(registrar).into(),249 i,250 caller_lookup.clone(),251 Judgement::Reasonable,252 T::Hashing::hash_of(&info),253 )?;254 }255 ensure!(IdentityOf::<T>::contains_key(&caller), "Identity does not exist.");256 }: _(RawOrigin::Signed(caller.clone()))257 verify {258 ensure!(!IdentityOf::<T>::contains_key(&caller), "Identity not cleared.");259 }260261 request_judgement {262 let caller: T::AccountId = whitelisted_caller();263 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());264265 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;266 let x in 0 .. T::MaxAdditionalFields::get() => {267 // Create their main identity with x additional fields268 let info = create_identity_info::<T>(x);269 let caller: T::AccountId = whitelisted_caller();270 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller));271 Identity::<T>::set_identity(caller_origin, Box::new(info))?;272 };273 }: _(RawOrigin::Signed(caller.clone()), r - 1, 10u32.into())274 verify {275 assert_last_event::<T>(Event::<T>::JudgementRequested { who: caller, registrar_index: r-1 }.into());276 }277278 cancel_request {279 let caller: T::AccountId = whitelisted_caller();280 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));281 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());282283 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;284 let x in 0 .. T::MaxAdditionalFields::get() => {285 // Create their main identity with x additional fields286 let info = create_identity_info::<T>(x);287 let caller: T::AccountId = whitelisted_caller();288 let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller));289 Identity::<T>::set_identity(caller_origin, Box::new(info))?;290 };291292 Identity::<T>::request_judgement(caller_origin, r - 1, 10u32.into())?;293 }: _(RawOrigin::Signed(caller.clone()), r - 1)294 verify {295 assert_last_event::<T>(Event::<T>::JudgementUnrequested { who: caller, registrar_index: r-1 }.into());296 }297298 set_fee {299 let caller: T::AccountId = whitelisted_caller();300 let caller_lookup = T::Lookup::unlookup(caller.clone());301302 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;303304 let registrar_origin = T::RegistrarOrigin::successful_origin();305 Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;306 let registrars = Registrars::<T>::get();307 ensure!(registrars[r as usize].as_ref().unwrap().fee == 0u32.into(), "Fee already set.");308 }: _(RawOrigin::Signed(caller), r, 100u32.into())309 verify {310 let registrars = Registrars::<T>::get();311 ensure!(registrars[r as usize].as_ref().unwrap().fee == 100u32.into(), "Fee not changed.");312 }313314 set_account_id {315 let caller: T::AccountId = whitelisted_caller();316 let caller_lookup = T::Lookup::unlookup(caller.clone());317 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());318319 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;320321 let registrar_origin = T::RegistrarOrigin::successful_origin();322 Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;323 let registrars = Registrars::<T>::get();324 ensure!(registrars[r as usize].as_ref().unwrap().account == caller, "id not set.");325 let new_account = T::Lookup::unlookup(account("new", 0, SEED));326 }: _(RawOrigin::Signed(caller), r, new_account)327 verify {328 let registrars = Registrars::<T>::get();329 ensure!(registrars[r as usize].as_ref().unwrap().account == account("new", 0, SEED), "id not changed.");330 }331332 set_fields {333 let caller: T::AccountId = whitelisted_caller();334 let caller_lookup = T::Lookup::unlookup(caller.clone());335 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());336337 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;338339 let registrar_origin = T::RegistrarOrigin::successful_origin();340 Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;341 let fields = IdentityFields(342 IdentityField::Display | IdentityField::Legal | IdentityField::Web | IdentityField::Riot343 | IdentityField::Email | IdentityField::PgpFingerprint | IdentityField::Image | IdentityField::Twitter344 );345 let registrars = Registrars::<T>::get();346 ensure!(registrars[r as usize].as_ref().unwrap().fields == Default::default(), "fields already set.");347 }: _(RawOrigin::Signed(caller), r, fields)348 verify {349 let registrars = Registrars::<T>::get();350 ensure!(registrars[r as usize].as_ref().unwrap().fields != Default::default(), "fields not set.");351 }352353 provide_judgement {354 // The user355 let user: T::AccountId = account("user", r, SEED);356 let user_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(user.clone()));357 let user_lookup = <T::Lookup as StaticLookup>::unlookup(user.clone());358 let _ = T::Currency::make_free_balance_be(&user, BalanceOf::<T>::max_value());359360 let caller: T::AccountId = whitelisted_caller();361 let caller_lookup = T::Lookup::unlookup(caller.clone());362 let _ = T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());363364 let r in 1 .. T::MaxRegistrars::get() - 1 => add_registrars::<T>(r)?;365 let x in 0 .. T::MaxAdditionalFields::get();366367 let info = create_identity_info::<T>(x);368 let info_hash = T::Hashing::hash_of(&info);369 Identity::<T>::set_identity(user_origin.clone(), Box::new(info))?;370371 let registrar_origin = T::RegistrarOrigin::successful_origin();372 Identity::<T>::add_registrar(registrar_origin, caller_lookup)?;373 Identity::<T>::request_judgement(user_origin, r, 10u32.into())?;374 }: _(RawOrigin::Signed(caller), r, user_lookup, Judgement::Reasonable, info_hash)375 verify {376 assert_last_event::<T>(Event::<T>::JudgementGiven { target: user, registrar_index: r }.into())377 }378379 kill_identity {380 let r in 1 .. T::MaxRegistrars::get() => add_registrars::<T>(r)?;381 let s in 0 .. T::MaxSubAccounts::get();382 let x in 0 .. T::MaxAdditionalFields::get();383384 let target: T::AccountId = account("target", 0, SEED);385 let target_origin: <T as frame_system::Config>::RuntimeOrigin = RawOrigin::Signed(target.clone()).into();386 let target_lookup = T::Lookup::unlookup(target.clone());387 let _ = T::Currency::make_free_balance_be(&target, BalanceOf::<T>::max_value());388389 let info = create_identity_info::<T>(x);390 Identity::<T>::set_identity(target_origin.clone(), Box::new(info.clone()))?;391 let _ = add_sub_accounts::<T>(&target, s)?;392393 // User requests judgement from all the registrars, and they approve394 for i in 0..r {395 let registrar: T::AccountId = account("registrar", i, SEED);396 let balance_to_use = T::Currency::minimum_balance() * 10u32.into();397 let _ = T::Currency::make_free_balance_be(®istrar, balance_to_use);398399 Identity::<T>::request_judgement(target_origin.clone(), i, 10u32.into())?;400 Identity::<T>::provide_judgement(401 RawOrigin::Signed(registrar).into(),402 i,403 target_lookup.clone(),404 Judgement::Reasonable,405 T::Hashing::hash_of(&info),406 )?;407 }408 ensure!(IdentityOf::<T>::contains_key(&target), "Identity not set");409 let origin = T::ForceOrigin::successful_origin();410 }: _<T::RuntimeOrigin>(origin, target_lookup)411 verify {412 ensure!(!IdentityOf::<T>::contains_key(&target), "Identity not removed");413 }414415 add_sub {416 let s in 0 .. T::MaxSubAccounts::get() - 1;417418 let caller: T::AccountId = whitelisted_caller();419 let _ = add_sub_accounts::<T>(&caller, s)?;420 let sub = account("new_sub", 0, SEED);421 let data = Data::Raw(vec![0; 32].try_into().unwrap());422 ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s, "Subs not set.");423 }: _(RawOrigin::Signed(caller.clone()), T::Lookup::unlookup(sub), data)424 verify {425 ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s + 1, "Subs not added.");426 }427428 rename_sub {429 let s in 1 .. T::MaxSubAccounts::get();430431 let caller: T::AccountId = whitelisted_caller();432 let (sub, _) = add_sub_accounts::<T>(&caller, s)?.remove(0);433 let data = Data::Raw(vec![1; 32].try_into().unwrap());434 ensure!(SuperOf::<T>::get(&sub).unwrap().1 != data, "data already set");435 }: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()), data.clone())436 verify {437 ensure!(SuperOf::<T>::get(&sub).unwrap().1 == data, "data not set");438 }439440 remove_sub {441 let s in 1 .. T::MaxSubAccounts::get();442443 let caller: T::AccountId = whitelisted_caller();444 let (sub, _) = add_sub_accounts::<T>(&caller, s)?.remove(0);445 ensure!(SuperOf::<T>::contains_key(&sub), "Sub doesn't exists");446 }: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()))447 verify {448 ensure!(!SuperOf::<T>::contains_key(&sub), "Sub not removed");449 }450451 quit_sub {452 let s in 0 .. T::MaxSubAccounts::get() - 1;453454 let caller: T::AccountId = whitelisted_caller();455 let sup = account("super", 0, SEED);456 let _ = add_sub_accounts::<T>(&sup, s)?;457 let sup_origin = RawOrigin::Signed(sup).into();458 Identity::<T>::add_sub(sup_origin, T::Lookup::unlookup(caller.clone()), Data::Raw(vec![0; 32].try_into().unwrap()))?;459 ensure!(SuperOf::<T>::contains_key(&caller), "Sub doesn't exists");460 }: _(RawOrigin::Signed(caller.clone()))461 verify {462 ensure!(!SuperOf::<T>::contains_key(&caller), "Sub not removed");463 }464465 impl_benchmark_test_suite!(Identity, crate::tests::new_test_ext(), crate::tests::Test);466}pallets/identity/src/lib.rsdiffbeforeafterboth--- a/pallets/identity/src/lib.rs
+++ b/pallets/identity/src/lib.rs
@@ -265,24 +265,51 @@
/// A name was set or reset (which will remove all judgements).
IdentitySet { who: T::AccountId },
/// A name was cleared, and the given balance returned.
- IdentityCleared { who: T::AccountId, deposit: BalanceOf<T> },
+ IdentityCleared {
+ who: T::AccountId,
+ deposit: BalanceOf<T>,
+ },
/// A name was removed and the given balance slashed.
- IdentityKilled { who: T::AccountId, deposit: BalanceOf<T> },
+ IdentityKilled {
+ who: T::AccountId,
+ deposit: BalanceOf<T>,
+ },
/// A judgement was asked from a registrar.
- JudgementRequested { who: T::AccountId, registrar_index: RegistrarIndex },
+ JudgementRequested {
+ who: T::AccountId,
+ registrar_index: RegistrarIndex,
+ },
/// A judgement request was retracted.
- JudgementUnrequested { who: T::AccountId, registrar_index: RegistrarIndex },
+ JudgementUnrequested {
+ who: T::AccountId,
+ registrar_index: RegistrarIndex,
+ },
/// A judgement was given by a registrar.
- JudgementGiven { target: T::AccountId, registrar_index: RegistrarIndex },
+ JudgementGiven {
+ target: T::AccountId,
+ registrar_index: RegistrarIndex,
+ },
/// A registrar was added.
RegistrarAdded { registrar_index: RegistrarIndex },
/// A sub-identity was added to an identity and the deposit paid.
- SubIdentityAdded { sub: T::AccountId, main: T::AccountId, deposit: BalanceOf<T> },
+ SubIdentityAdded {
+ sub: T::AccountId,
+ main: T::AccountId,
+ deposit: BalanceOf<T>,
+ },
/// A sub-identity was removed from an identity and the deposit freed.
- SubIdentityRemoved { sub: T::AccountId, main: T::AccountId, deposit: BalanceOf<T> },
+ SubIdentityRemoved {
+ sub: T::AccountId,
+ main: T::AccountId,
+ deposit: BalanceOf<T>,
+ },
/// A sub-identity was cleared, and the given deposit repatriated from the
/// main identity account to the sub-identity account.
- SubIdentityRevoked { sub: T::AccountId, main: T::AccountId, deposit: BalanceOf<T> },
+ SubIdentityRevoked {
+ sub: T::AccountId,
+ main: T::AccountId,
+ deposit: BalanceOf<T>,
+ },
}
#[pallet::call]
@@ -358,7 +385,10 @@
) -> DispatchResultWithPostInfo {
let sender = ensure_signed(origin)?;
let extra_fields = info.additional.len() as u32;
- ensure!(extra_fields <= T::MaxAdditionalFields::get(), Error::<T>::TooManyFields);
+ ensure!(
+ extra_fields <= T::MaxAdditionalFields::get(),
+ Error::<T>::TooManyFields
+ );
let fd = <BalanceOf<T>>::from(extra_fields) * T::FieldDeposit::get();
let mut id = match <IdentityOf<T>>::get(&sender) {
@@ -367,7 +397,7 @@
id.judgements.retain(|j| j.1.is_sticky());
id.info = *info;
id
- },
+ }
None => Registration {
info: *info,
judgements: BoundedVec::default(),
@@ -441,8 +471,10 @@
let (old_deposit, old_ids) = <SubsOf<T>>::get(&sender);
let new_deposit = T::SubAccountDeposit::get() * <BalanceOf<T>>::from(subs.len() as u32);
- let not_other_sub =
- subs.iter().filter_map(|i| SuperOf::<T>::get(&i.0)).all(|i| i.0 == sender);
+ let not_other_sub = subs
+ .iter()
+ .filter_map(|i| SuperOf::<T>::get(&i.0))
+ .all(|i| i.0 == sender);
ensure!(not_other_sub, Error::<T>::AlreadyClaimed);
if old_deposit < new_deposit {
@@ -459,7 +491,8 @@
let mut ids = BoundedVec::<T::AccountId, T::MaxSubAccounts>::default();
for (id, name) in subs {
<SuperOf<T>>::insert(&id, (sender.clone(), name));
- ids.try_push(id).expect("subs length is less than T::MaxSubAccounts; qed");
+ ids.try_push(id)
+ .expect("subs length is less than T::MaxSubAccounts; qed");
}
let new_subs = ids.len();
@@ -514,7 +547,10 @@
let err_amount = T::Currency::unreserve(&sender, deposit);
debug_assert!(err_amount.is_zero());
- Self::deposit_event(Event::IdentityCleared { who: sender, deposit });
+ Self::deposit_event(Event::IdentityCleared {
+ who: sender,
+ deposit,
+ });
Ok(Some(T::WeightInfo::clear_identity(
id.judgements.len() as u32, // R
@@ -568,14 +604,17 @@
let item = (reg_index, Judgement::FeePaid(registrar.fee));
match id.judgements.binary_search_by_key(®_index, |x| x.0) {
- Ok(i) =>
+ Ok(i) => {
if id.judgements[i].1.is_sticky() {
- return Err(Error::<T>::StickyJudgement.into())
+ return Err(Error::<T>::StickyJudgement.into());
} else {
id.judgements[i] = item
- },
- Err(i) =>
- id.judgements.try_insert(i, item).map_err(|_| Error::<T>::TooManyRegistrars)?,
+ }
+ }
+ Err(i) => id
+ .judgements
+ .try_insert(i, item)
+ .map_err(|_| Error::<T>::TooManyRegistrars)?,
}
T::Currency::reserve(&sender, registrar.fee)?;
@@ -589,8 +628,11 @@
registrar_index: reg_index,
});
- Ok(Some(T::WeightInfo::request_judgement(judgements as u32, extra_fields as u32))
- .into())
+ Ok(Some(T::WeightInfo::request_judgement(
+ judgements as u32,
+ extra_fields as u32,
+ ))
+ .into())
}
/// Cancel a previous request.
@@ -629,7 +671,7 @@
let fee = if let Judgement::FeePaid(fee) = id.judgements.remove(pos).1 {
fee
} else {
- return Err(Error::<T>::JudgementGiven.into())
+ return Err(Error::<T>::JudgementGiven.into());
};
let err_amount = T::Currency::unreserve(&sender, fee);
@@ -643,7 +685,11 @@
registrar_index: reg_index,
});
- Ok(Some(T::WeightInfo::cancel_request(judgements as u32, extra_fields as u32)).into())
+ Ok(Some(T::WeightInfo::cancel_request(
+ judgements as u32,
+ extra_fields as u32,
+ ))
+ .into())
}
/// Set the fee required for a judgement to be requested from a registrar.
@@ -810,7 +856,7 @@
let mut id = <IdentityOf<T>>::get(&target).ok_or(Error::<T>::InvalidTarget)?;
if T::Hashing::hash_of(&id.info) != identity {
- return Err(Error::<T>::JudgementForDifferentIdentity.into())
+ return Err(Error::<T>::JudgementForDifferentIdentity.into());
}
let item = (reg_index, judgement);
@@ -826,7 +872,7 @@
.map_err(|_| Error::<T>::JudgementPaymentFailed)?;
}
id.judgements[position] = item
- },
+ }
Err(position) => id
.judgements
.try_insert(position, item)
@@ -836,10 +882,16 @@
let judgements = id.judgements.len();
let extra_fields = id.info.additional.len();
<IdentityOf<T>>::insert(&target, id);
- Self::deposit_event(Event::JudgementGiven { target, registrar_index: reg_index });
+ Self::deposit_event(Event::JudgementGiven {
+ target,
+ registrar_index: reg_index,
+ });
- Ok(Some(T::WeightInfo::provide_judgement(judgements as u32, extra_fields as u32))
- .into())
+ Ok(Some(T::WeightInfo::provide_judgement(
+ judgements as u32,
+ extra_fields as u32,
+ ))
+ .into())
}
/// Remove an account's identity and sub-account information and slash the deposits.
@@ -885,7 +937,10 @@
// Slash their deposit from them.
T::Slashed::on_unbalanced(T::Currency::slash_reserved(&target, deposit).0);
- Self::deposit_event(Event::IdentityKilled { who: target, deposit });
+ Self::deposit_event(Event::IdentityKilled {
+ who: target,
+ deposit,
+ });
Ok(Some(T::WeightInfo::kill_identity(
id.judgements.len() as u32, // R
@@ -911,10 +966,16 @@
) -> DispatchResult {
let sender = ensure_signed(origin)?;
let sub = T::Lookup::lookup(sub)?;
- ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
+ ensure!(
+ IdentityOf::<T>::contains_key(&sender),
+ Error::<T>::NoIdentity
+ );
// Check if it's already claimed as sub-identity.
- ensure!(!SuperOf::<T>::contains_key(&sub), Error::<T>::AlreadyClaimed);
+ ensure!(
+ !SuperOf::<T>::contains_key(&sub),
+ Error::<T>::AlreadyClaimed
+ );
SubsOf::<T>::try_mutate(&sender, |(ref mut subs_deposit, ref mut sub_ids)| {
// Ensure there is space and that the deposit is paid.
@@ -926,10 +987,16 @@
T::Currency::reserve(&sender, deposit)?;
SuperOf::<T>::insert(&sub, (sender.clone(), data));
- sub_ids.try_push(sub.clone()).expect("sub ids length checked above; qed");
+ sub_ids
+ .try_push(sub.clone())
+ .expect("sub ids length checked above; qed");
*subs_deposit = subs_deposit.saturating_add(deposit);
- Self::deposit_event(Event::SubIdentityAdded { sub, main: sender.clone(), deposit });
+ Self::deposit_event(Event::SubIdentityAdded {
+ sub,
+ main: sender.clone(),
+ deposit,
+ });
Ok(())
})
}
@@ -947,8 +1014,14 @@
) -> DispatchResult {
let sender = ensure_signed(origin)?;
let sub = T::Lookup::lookup(sub)?;
- ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
- ensure!(SuperOf::<T>::get(&sub).map_or(false, |x| x.0 == sender), Error::<T>::NotOwned);
+ ensure!(
+ IdentityOf::<T>::contains_key(&sender),
+ Error::<T>::NoIdentity
+ );
+ ensure!(
+ SuperOf::<T>::get(&sub).map_or(false, |x| x.0 == sender),
+ Error::<T>::NotOwned
+ );
SuperOf::<T>::insert(&sub, (sender, data));
Ok(())
}
@@ -964,7 +1037,10 @@
#[pallet::weight(T::WeightInfo::remove_sub(T::MaxSubAccounts::get()))]
pub fn remove_sub(origin: OriginFor<T>, sub: AccountIdLookupOf<T>) -> DispatchResult {
let sender = ensure_signed(origin)?;
- ensure!(IdentityOf::<T>::contains_key(&sender), Error::<T>::NoIdentity);
+ ensure!(
+ IdentityOf::<T>::contains_key(&sender),
+ Error::<T>::NoIdentity
+ );
let sub = T::Lookup::lookup(sub)?;
let (sup, _) = SuperOf::<T>::get(&sub).ok_or(Error::<T>::NotSub)?;
ensure!(sup == sender, Error::<T>::NotOwned);
@@ -975,7 +1051,11 @@
*subs_deposit -= deposit;
let err_amount = T::Currency::unreserve(&sender, deposit);
debug_assert!(err_amount.is_zero());
- Self::deposit_event(Event::SubIdentityRemoved { sub, main: sender, deposit });
+ Self::deposit_event(Event::SubIdentityRemoved {
+ sub,
+ main: sender,
+ deposit,
+ });
});
Ok(())
}
@@ -1024,7 +1104,8 @@
/// Check if the account has corresponding identity information by the identity field.
pub fn has_identity(who: &T::AccountId, fields: u64) -> bool {
- IdentityOf::<T>::get(who)
- .map_or(false, |registration| (registration.info.fields().0.bits() & fields) == fields)
+ IdentityOf::<T>::get(who).map_or(false, |registration| {
+ (registration.info.fields().0.bits() & fields) == fields
+ })
}
}
pallets/identity/src/tests.rsdiffbeforeafterboth--- a/pallets/identity/src/tests.rs
+++ b/pallets/identity/src/tests.rs
@@ -135,7 +135,9 @@
}
pub fn new_test_ext() -> sp_io::TestExternalities {
- let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+ let mut t = frame_system::GenesisConfig::default()
+ .build_storage::<Test>()
+ .unwrap();
pallet_balances::GenesisConfig::<Test> {
balances: vec![(1, 10), (2, 10), (3, 10), (10, 100), (20, 100), (30, 100)],
}
@@ -155,7 +157,12 @@
fn twenty() -> IdentityInfo<MaxAdditionalFields> {
IdentityInfo {
display: Data::Raw(b"twenty".to_vec().try_into().unwrap()),
- legal: Data::Raw(b"The Right Ordinal Twenty, Esq.".to_vec().try_into().unwrap()),
+ legal: Data::Raw(
+ b"The Right Ordinal Twenty, Esq."
+ .to_vec()
+ .try_into()
+ .unwrap(),
+ ),
..Default::default()
}
}
@@ -170,7 +177,10 @@
Error::<Test>::NoIdentity
);
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
// first sub account
assert_ok!(Identity::add_sub(RuntimeOrigin::signed(10), 1, data(1)));
@@ -215,8 +225,14 @@
new_test_ext().execute_with(|| {
let data = |x| Data::Raw(vec![x; 1].try_into().unwrap());
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(20), Box::new(twenty())));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(20),
+ Box::new(twenty())
+ ));
// 10 claims 1 as a subaccount
assert_ok!(Identity::add_sub(RuntimeOrigin::signed(10), 1, data(1)));
@@ -258,7 +274,11 @@
assert_ok!(Identity::set_fields(RuntimeOrigin::signed(3), 0, fields));
assert_eq!(
Identity::registrars(),
- vec![Some(RegistrarInfo { account: 3, fee: 10, fields })]
+ vec![Some(RegistrarInfo {
+ account: 3,
+ fee: 10,
+ fields
+ })]
);
});
}
@@ -283,15 +303,30 @@
assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 3));
assert_ok!(Identity::set_fee(RuntimeOrigin::signed(3), 0, 10));
let mut three_fields = ten();
- three_fields.additional.try_push(Default::default()).unwrap();
- three_fields.additional.try_push(Default::default()).unwrap();
- assert!(three_fields.additional.try_push(Default::default()).is_err());
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+ three_fields
+ .additional
+ .try_push(Default::default())
+ .unwrap();
+ three_fields
+ .additional
+ .try_push(Default::default())
+ .unwrap();
+ assert!(three_fields
+ .additional
+ .try_push(Default::default())
+ .is_err());
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
assert_eq!(Identity::identity(10).unwrap().info, ten());
assert_eq!(Balances::free_balance(10), 90);
assert_ok!(Identity::clear_identity(RuntimeOrigin::signed(10)));
assert_eq!(Balances::free_balance(10), 100);
- assert_noop!(Identity::clear_identity(RuntimeOrigin::signed(10)), Error::<Test>::NotNamed);
+ assert_noop!(
+ Identity::clear_identity(RuntimeOrigin::signed(10)),
+ Error::<Test>::NotNamed
+ );
});
}
@@ -321,7 +356,10 @@
Error::<Test>::InvalidTarget
);
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
assert_noop!(
Identity::provide_judgement(
RuntimeOrigin::signed(3),
@@ -363,7 +401,10 @@
Judgement::Reasonable,
identity_hash
));
- assert_eq!(Identity::identity(10).unwrap().judgements, vec![(0, Judgement::Reasonable)]);
+ assert_eq!(
+ Identity::identity(10).unwrap().judgements,
+ vec![(0, Judgement::Reasonable)]
+ );
});
}
@@ -371,7 +412,10 @@
fn clearing_judgement_should_work() {
new_test_ext().execute_with(|| {
assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 3));
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
assert_ok!(Identity::provide_judgement(
RuntimeOrigin::signed(3),
0,
@@ -387,8 +431,14 @@
#[test]
fn killing_slashing_should_work() {
new_test_ext().execute_with(|| {
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
- assert_noop!(Identity::kill_identity(RuntimeOrigin::signed(1), 10), BadOrigin);
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
+ assert_noop!(
+ Identity::kill_identity(RuntimeOrigin::signed(1), 10),
+ BadOrigin
+ );
assert_ok!(Identity::kill_identity(RuntimeOrigin::signed(2), 10));
assert_eq!(Identity::identity(10), None);
assert_eq!(Balances::free_balance(10), 90);
@@ -408,28 +458,52 @@
Error::<Test>::NotFound
);
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
assert_ok!(Identity::set_subs(RuntimeOrigin::signed(10), subs.clone()));
assert_eq!(Balances::free_balance(10), 80);
assert_eq!(Identity::subs_of(10), (10, vec![20].try_into().unwrap()));
- assert_eq!(Identity::super_of(20), Some((10, Data::Raw(vec![40; 1].try_into().unwrap()))));
+ assert_eq!(
+ Identity::super_of(20),
+ Some((10, Data::Raw(vec![40; 1].try_into().unwrap())))
+ );
// push another item and re-set it.
subs.push((30, Data::Raw(vec![50; 1].try_into().unwrap())));
assert_ok!(Identity::set_subs(RuntimeOrigin::signed(10), subs.clone()));
assert_eq!(Balances::free_balance(10), 70);
- assert_eq!(Identity::subs_of(10), (20, vec![20, 30].try_into().unwrap()));
- assert_eq!(Identity::super_of(20), Some((10, Data::Raw(vec![40; 1].try_into().unwrap()))));
- assert_eq!(Identity::super_of(30), Some((10, Data::Raw(vec![50; 1].try_into().unwrap()))));
+ assert_eq!(
+ Identity::subs_of(10),
+ (20, vec![20, 30].try_into().unwrap())
+ );
+ assert_eq!(
+ Identity::super_of(20),
+ Some((10, Data::Raw(vec![40; 1].try_into().unwrap())))
+ );
+ assert_eq!(
+ Identity::super_of(30),
+ Some((10, Data::Raw(vec![50; 1].try_into().unwrap())))
+ );
// switch out one of the items and re-set.
subs[0] = (40, Data::Raw(vec![60; 1].try_into().unwrap()));
assert_ok!(Identity::set_subs(RuntimeOrigin::signed(10), subs.clone()));
assert_eq!(Balances::free_balance(10), 70); // no change in the balance
- assert_eq!(Identity::subs_of(10), (20, vec![40, 30].try_into().unwrap()));
+ assert_eq!(
+ Identity::subs_of(10),
+ (20, vec![40, 30].try_into().unwrap())
+ );
assert_eq!(Identity::super_of(20), None);
- assert_eq!(Identity::super_of(30), Some((10, Data::Raw(vec![50; 1].try_into().unwrap()))));
- assert_eq!(Identity::super_of(40), Some((10, Data::Raw(vec![60; 1].try_into().unwrap()))));
+ assert_eq!(
+ Identity::super_of(30),
+ Some((10, Data::Raw(vec![50; 1].try_into().unwrap())))
+ );
+ assert_eq!(
+ Identity::super_of(40),
+ Some((10, Data::Raw(vec![60; 1].try_into().unwrap())))
+ );
// clear
assert_ok!(Identity::set_subs(RuntimeOrigin::signed(10), vec![]));
@@ -449,7 +523,10 @@
#[test]
fn clearing_account_should_remove_subaccounts_and_refund() {
new_test_ext().execute_with(|| {
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
assert_ok!(Identity::set_subs(
RuntimeOrigin::signed(10),
vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]
@@ -463,7 +540,10 @@
#[test]
fn killing_account_should_remove_subaccounts_and_not_refund() {
new_test_ext().execute_with(|| {
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
assert_ok!(Identity::set_subs(
RuntimeOrigin::signed(10),
vec![(20, Data::Raw(vec![40; 1].try_into().unwrap()))]
@@ -483,8 +563,15 @@
Identity::cancel_request(RuntimeOrigin::signed(10), 0),
Error::<Test>::NoIdentity
);
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
- assert_ok!(Identity::request_judgement(RuntimeOrigin::signed(10), 0, 10));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
+ assert_ok!(Identity::request_judgement(
+ RuntimeOrigin::signed(10),
+ 0,
+ 10
+ ));
assert_ok!(Identity::cancel_request(RuntimeOrigin::signed(10), 0));
assert_eq!(Balances::free_balance(10), 90);
assert_noop!(
@@ -511,12 +598,19 @@
new_test_ext().execute_with(|| {
assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 3));
assert_ok!(Identity::set_fee(RuntimeOrigin::signed(3), 0, 10));
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
assert_noop!(
Identity::request_judgement(RuntimeOrigin::signed(10), 0, 9),
Error::<Test>::FeeChanged
);
- assert_ok!(Identity::request_judgement(RuntimeOrigin::signed(10), 0, 10));
+ assert_ok!(Identity::request_judgement(
+ RuntimeOrigin::signed(10),
+ 0,
+ 10
+ ));
// 10 for the judgement request, 10 for the identity.
assert_eq!(Balances::free_balance(10), 80);
@@ -543,7 +637,11 @@
// Requesting from a second registrar still works.
assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 4));
- assert_ok!(Identity::request_judgement(RuntimeOrigin::signed(10), 1, 10));
+ assert_ok!(Identity::request_judgement(
+ RuntimeOrigin::signed(10),
+ 1,
+ 10
+ ));
// Re-requesting after the judgement has been reduced works.
assert_ok!(Identity::provide_judgement(
@@ -553,7 +651,11 @@
Judgement::OutOfDate,
BlakeTwo256::hash_of(&ten())
));
- assert_ok!(Identity::request_judgement(RuntimeOrigin::signed(10), 0, 10));
+ assert_ok!(Identity::request_judgement(
+ RuntimeOrigin::signed(10),
+ 0,
+ 10
+ ));
});
}
@@ -562,8 +664,15 @@
new_test_ext().execute_with(|| {
assert_ok!(Identity::add_registrar(RuntimeOrigin::signed(1), 3));
assert_ok!(Identity::set_fee(RuntimeOrigin::signed(3), 0, 10));
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
- assert_ok!(Identity::request_judgement(RuntimeOrigin::signed(10), 0, 10));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
+ assert_ok!(Identity::request_judgement(
+ RuntimeOrigin::signed(10),
+ 0,
+ 10
+ ));
// 10 for the judgement request, 10 for the identity.
assert_eq!(Balances::free_balance(10), 80);
@@ -628,7 +737,10 @@
#[test]
fn test_has_identity() {
new_test_ext().execute_with(|| {
- assert_ok!(Identity::set_identity(RuntimeOrigin::signed(10), Box::new(ten())));
+ assert_ok!(Identity::set_identity(
+ RuntimeOrigin::signed(10),
+ Box::new(ten())
+ ));
assert!(Identity::has_identity(&10, IdentityField::Display as u64));
assert!(Identity::has_identity(&10, IdentityField::Legal as u64));
assert!(Identity::has_identity(
pallets/identity/src/types.rsdiffbeforeafterboth--- a/pallets/identity/src/types.rs
+++ b/pallets/identity/src/types.rs
@@ -87,7 +87,7 @@
.expect("bound checked in match arm condition; qed");
input.read(&mut r[..])?;
Data::Raw(r)
- },
+ }
34 => Data::BlakeTwo256(<[u8; 32]>::decode(input)?),
35 => Data::Sha256(<[u8; 32]>::decode(input)?),
36 => Data::Keccak256(<[u8; 32]>::decode(input)?),
@@ -106,7 +106,7 @@
let mut r = vec![l as u8 + 1; l + 1];
r[1..].copy_from_slice(&x[..l as usize]);
r
- },
+ }
Data::BlakeTwo256(ref h) => once(34u8).chain(h.iter().cloned()).collect(),
Data::Sha256(ref h) => once(35u8).chain(h.iter().cloned()).collect(),
Data::Keccak256(ref h) => once(36u8).chain(h.iter().cloned()).collect(),
@@ -175,19 +175,25 @@
let variants = variants
.variant("BlakeTwo256", |v| {
- v.index(34).fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
+ v.index(34)
+ .fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
})
.variant("Sha256", |v| {
- v.index(35).fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
+ v.index(35)
+ .fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
})
.variant("Keccak256", |v| {
- v.index(36).fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
+ v.index(36)
+ .fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
})
.variant("ShaThree256", |v| {
- v.index(37).fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
+ v.index(37)
+ .fields(Fields::unnamed().field(|f| f.ty::<[u8; 32]>()))
});
- Type::builder().path(Path::new("Data", module_path!())).variant(variants)
+ Type::builder()
+ .path(Path::new("Data", module_path!()))
+ .variant(variants)
}
}
@@ -280,7 +286,9 @@
impl Decode for IdentityFields {
fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
let field = u64::decode(input)?;
- Ok(Self(<BitFlags<IdentityField>>::from_bits(field as u64).map_err(|_| "invalid value")?))
+ Ok(Self(
+ <BitFlags<IdentityField>>::from_bits(field as u64).map_err(|_| "invalid value")?,
+ ))
}
}
impl TypeInfo for IdentityFields {
@@ -289,7 +297,10 @@
fn type_info() -> Type {
Type::builder()
.path(Path::new("BitFlags", module_path!()))
- .type_params(vec![TypeParameter::new("T", Some(meta_type::<IdentityField>()))])
+ .type_params(vec![TypeParameter::new(
+ "T",
+ Some(meta_type::<IdentityField>()),
+ )])
.composite(Fields::unnamed().field(|f| f.ty::<u64>().type_name("IdentityField")))
}
}
@@ -413,10 +424,17 @@
> Registration<Balance, MaxJudgements, MaxAdditionalFields>
{
pub(crate) fn total_deposit(&self) -> Balance {
- self.deposit +
- self.judgements
+ self.deposit
+ + self
+ .judgements
.iter()
- .map(|(_, ref j)| if let Judgement::FeePaid(fee) = j { *fee } else { Zero::zero() })
+ .map(|(_, ref j)| {
+ if let Judgement::FeePaid(fee) = j {
+ *fee
+ } else {
+ Zero::zero()
+ }
+ })
.fold(Zero::zero(), |a, i| a + i)
}
}
@@ -429,7 +447,11 @@
{
fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
let (judgements, deposit, info) = Decode::decode(&mut AppendZerosInput::new(input))?;
- Ok(Self { judgements, deposit, info })
+ Ok(Self {
+ judgements,
+ deposit,
+ info,
+ })
}
}
runtime/common/config/pallets/collator_selection.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/collator_selection.rs
+++ b/runtime/common/config/pallets/collator_selection.rs
@@ -54,9 +54,10 @@
}
parameter_types! {
- pub const BasicDeposit: Balance = 10 * UNIQUE; // todo:collator
+ // These do not matter as we forbid non-sudo operations with the identity pallet
+ pub const BasicDeposit: Balance = 10 * UNIQUE;
pub const FieldDeposit: Balance = 25 * MILLIUNIQUE;
- pub const SubAccountDeposit: Balance = 2 * UNIQUE; // end todo
+ pub const SubAccountDeposit: Balance = 2 * UNIQUE;
pub const MaxSubAccounts: u32 = 100;
pub const MaxAdditionalFields: u32 = 100;
pub const MaxRegistrars: u32 = 20;
@@ -89,7 +90,6 @@
type TreasuryAccountId = TreasuryAccountId;
type PotId = PotId;
type MaxCollators = MaxCollators;
- // todo:collator kick threshold should be in storage and configured only by root -- or rather UpdateOrigin
type SlashRatio = SlashRatio;
type ValidatorId = <Self as frame_system::Config>::AccountId;
type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -705,7 +705,6 @@
#[cfg(feature = "rmrk")]
list_benchmark!(list, extra, pallet_proxy_rmrk_equip, RmrkEquip);
- // todo:collator check benchmarks
#[cfg(feature = "collator-selection")]
list_benchmark!(list, extra, pallet_collator_selection, CollatorSelection);
@@ -772,7 +771,6 @@
#[cfg(feature = "rmrk")]
add_benchmark!(params, batches, pallet_proxy_rmrk_equip, RmrkEquip);
- // todo:collator check benchmarks
#[cfg(feature = "collator-selection")]
add_benchmark!(params, batches, pallet_collator_selection, CollatorSelection);
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -39,6 +39,7 @@
'pallet-unique/runtime-benchmarks',
'pallet-inflation/runtime-benchmarks',
'pallet-app-promotion/runtime-benchmarks',
+ 'pallet-collator-selection/runtime-benchmarks',
'pallet-unique-scheduler-v2/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -38,6 +38,7 @@
'pallet-unique/runtime-benchmarks',
'pallet-foreign-assets/runtime-benchmarks',
'pallet-inflation/runtime-benchmarks',
+ 'pallet-collator-selection/runtime-benchmarks',
'pallet-app-promotion/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -38,6 +38,7 @@
'pallet-unique/runtime-benchmarks',
'pallet-foreign-assets/runtime-benchmarks',
'pallet-inflation/runtime-benchmarks',
+ 'pallet-collator-selection/runtime-benchmarks',
'pallet-app-promotion/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
tests/src/interfaces/augment-api-events.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-events.ts
+++ b/tests/src/interfaces/augment-api-events.ts
@@ -105,8 +105,8 @@
CandidateRemoved: AugmentedEvent<ApiType, [accountId: AccountId32], { accountId: AccountId32 }>;
InvulnerableAdded: AugmentedEvent<ApiType, [invulnerable: AccountId32], { invulnerable: AccountId32 }>;
InvulnerableRemoved: AugmentedEvent<ApiType, [invulnerable: AccountId32], { invulnerable: AccountId32 }>;
- LicenseForfeited: AugmentedEvent<ApiType, [accountId: AccountId32, depositReturned: u128], { accountId: AccountId32, depositReturned: u128 }>;
LicenseObtained: AugmentedEvent<ApiType, [accountId: AccountId32, deposit: u128], { accountId: AccountId32, deposit: u128 }>;
+ LicenseReleased: AugmentedEvent<ApiType, [accountId: AccountId32, depositReturned: u128], { accountId: AccountId32, depositReturned: u128 }>;
/**
* Generic event
**/
tests/src/interfaces/augment-api-tx.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-tx.ts
+++ b/tests/src/interfaces/augment-api-tx.ts
@@ -313,15 +313,15 @@
**/
insertEvents: AugmentedSubmittable<(events: Vec<Bytes> | (Bytes | string | Uint8Array)[]) => SubmittableExtrinsic<ApiType>, [Vec<Bytes>]>;
/**
- * Insert or remove identities.
- **/
- insertIdentities: AugmentedSubmittable<(identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>> | ([AccountId32 | string | Uint8Array, Option<PalletIdentityRegistration> | null | Uint8Array | PalletIdentityRegistration | { judgements?: any; deposit?: any; info?: any } | string])[]) => SubmittableExtrinsic<ApiType>, [Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>]>;
- /**
* Insert items into contract storage, this method can be called
* multiple times
**/
setData: AugmentedSubmittable<(address: H160 | string | Uint8Array, data: Vec<ITuple<[H256, H256]>> | ([H256 | string | Uint8Array, H256 | string | Uint8Array])[]) => SubmittableExtrinsic<ApiType>, [H160, Vec<ITuple<[H256, H256]>>]>;
/**
+ * Insert or remove identities.
+ **/
+ setIdentities: AugmentedSubmittable<(identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>> | ([AccountId32 | string | Uint8Array, Option<PalletIdentityRegistration> | null | Uint8Array | PalletIdentityRegistration | { judgements?: any; deposit?: any; info?: any } | string])[]) => SubmittableExtrinsic<ApiType>, [Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>]>;
+ /**
* Generic tx
**/
[key: string]: SubmittableExtrinsicFunction<ApiType>;
tests/src/interfaces/default/types.tsdiffbeforeafterboth--- a/tests/src/interfaces/default/types.ts
+++ b/tests/src/interfaces/default/types.ts
@@ -1283,8 +1283,8 @@
readonly accountId: AccountId32;
readonly deposit: u128;
} & Struct;
- readonly isLicenseForfeited: boolean;
- readonly asLicenseForfeited: {
+ readonly isLicenseReleased: boolean;
+ readonly asLicenseReleased: {
readonly accountId: AccountId32;
readonly depositReturned: u128;
} & Struct;
@@ -1296,7 +1296,7 @@
readonly asCandidateRemoved: {
readonly accountId: AccountId32;
} & Struct;
- readonly type: 'InvulnerableAdded' | 'InvulnerableRemoved' | 'LicenseObtained' | 'LicenseForfeited' | 'CandidateAdded' | 'CandidateRemoved';
+ readonly type: 'InvulnerableAdded' | 'InvulnerableRemoved' | 'LicenseObtained' | 'LicenseReleased' | 'CandidateAdded' | 'CandidateRemoved';
}
/** @name PalletCommonError */
@@ -1477,11 +1477,11 @@
readonly asInsertEvents: {
readonly events: Vec<Bytes>;
} & Struct;
- readonly isInsertIdentities: boolean;
- readonly asInsertIdentities: {
+ readonly isSetIdentities: boolean;
+ readonly asSetIdentities: {
readonly identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>;
} & Struct;
- readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents' | 'InsertIdentities';
+ readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents' | 'SetIdentities';
}
/** @name PalletDataManagementError */
tests/src/interfaces/lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/lookup.ts
+++ b/tests/src/interfaces/lookup.ts
@@ -198,7 +198,7 @@
accountId: 'AccountId32',
deposit: 'u128',
},
- LicenseForfeited: {
+ LicenseReleased: {
accountId: 'AccountId32',
depositReturned: 'u128',
},
tests/src/interfaces/types-lookup.tsdiffbeforeafterboth--- a/tests/src/interfaces/types-lookup.ts
+++ b/tests/src/interfaces/types-lookup.ts
@@ -212,8 +212,8 @@
readonly accountId: AccountId32;
readonly deposit: u128;
} & Struct;
- readonly isLicenseForfeited: boolean;
- readonly asLicenseForfeited: {
+ readonly isLicenseReleased: boolean;
+ readonly asLicenseReleased: {
readonly accountId: AccountId32;
readonly depositReturned: u128;
} & Struct;
@@ -225,7 +225,7 @@
readonly asCandidateRemoved: {
readonly accountId: AccountId32;
} & Struct;
- readonly type: 'InvulnerableAdded' | 'InvulnerableRemoved' | 'LicenseObtained' | 'LicenseForfeited' | 'CandidateAdded' | 'CandidateRemoved';
+ readonly type: 'InvulnerableAdded' | 'InvulnerableRemoved' | 'LicenseObtained' | 'LicenseReleased' | 'CandidateAdded' | 'CandidateRemoved';
}
/** @name PalletSessionEvent (31) */
@@ -3513,11 +3513,11 @@
readonly asInsertEvents: {
readonly events: Vec<Bytes>;
} & Struct;
- readonly isInsertIdentities: boolean;
- readonly asInsertIdentities: {
+ readonly isSetIdentities: boolean;
+ readonly asSetIdentities: {
readonly identities: Vec<ITuple<[AccountId32, Option<PalletIdentityRegistration>]>>;
} & Struct;
- readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents' | 'InsertIdentities';
+ readonly type: 'Begin' | 'SetData' | 'Finish' | 'InsertEthLogs' | 'InsertEvents' | 'SetIdentities';
}
/** @name PalletMaintenanceCall (418) */