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

refactor calls pallet-identity

parent f443567d
No related branches found
No related tags found
No related merge requests found
Pipeline #34625 passed
...@@ -346,7 +346,7 @@ where ...@@ -346,7 +346,7 @@ where
sp_membership::Event::<IdtyIndex>::MembershipRenewed(_) => {} sp_membership::Event::<IdtyIndex>::MembershipRenewed(_) => {}
sp_membership::Event::<IdtyIndex>::MembershipRequested(_) => {} sp_membership::Event::<IdtyIndex>::MembershipRequested(_) => {}
sp_membership::Event::<IdtyIndex>::PendingMembershipExpired(idty_index) => { sp_membership::Event::<IdtyIndex>::PendingMembershipExpired(idty_index) => {
Self::dispatch_idty_call(pallet_identity::Call::remove_identity { Self::dispatch_idty_call(pallet_identity::Call::force_remove_identity {
idty_index: *idty_index, idty_index: *idty_index,
idty_name: None, idty_name: None,
reason: pallet_identity::IdtyRemovalReason::Other( reason: pallet_identity::IdtyRemovalReason::Other(
......
...@@ -225,7 +225,7 @@ benchmarks! { ...@@ -225,7 +225,7 @@ benchmarks! {
assert!(IdentityIndexOf::<T>::get(&account.key).is_none(), "Identity not revoked"); assert!(IdentityIndexOf::<T>::get(&account.key).is_none(), "Identity not revoked");
} }
remove_identity { force_remove_identity {
let new_identity: T::AccountId = account("new_identity", 2, SEED); let new_identity: T::AccountId = account("new_identity", 2, SEED);
let account: Account<T> = create_one_identity(new_identity)?; let account: Account<T> = create_one_identity(new_identity)?;
let identities = Pallet::<T>::identities_count(); let identities = Pallet::<T>::identities_count();
......
...@@ -551,9 +551,9 @@ pub mod pallet { ...@@ -551,9 +551,9 @@ pub mod pallet {
} }
#[pallet::call_index(5)] #[pallet::call_index(5)]
#[pallet::weight(T::WeightInfo::remove_identity())] #[pallet::weight(T::WeightInfo::force_remove_identity())]
/// remove an identity from storage /// remove an identity from storage
pub fn remove_identity( pub fn force_remove_identity(
origin: OriginFor<T>, origin: OriginFor<T>,
idty_index: T::IdtyIndex, idty_index: T::IdtyIndex,
idty_name: Option<IdtyName>, idty_name: Option<IdtyName>,
......
...@@ -25,7 +25,7 @@ pub trait WeightInfo { ...@@ -25,7 +25,7 @@ pub trait WeightInfo {
fn validate_identity() -> Weight; fn validate_identity() -> Weight;
fn change_owner_key() -> Weight; fn change_owner_key() -> Weight;
fn revoke_identity() -> Weight; fn revoke_identity() -> Weight;
fn remove_identity() -> Weight; fn force_remove_identity() -> Weight;
fn prune_item_identities_names(i: u32) -> Weight; fn prune_item_identities_names(i: u32) -> Weight;
fn fix_sufficients() -> Weight; fn fix_sufficients() -> Weight;
fn link_account() -> Weight; fn link_account() -> Weight;
...@@ -120,7 +120,7 @@ impl WeightInfo for () { ...@@ -120,7 +120,7 @@ impl WeightInfo for () {
// Storage: Parameters ParametersStorage (r:1 w:0) // Storage: Parameters ParametersStorage (r:1 w:0)
// Storage: Identity IdentityIndexOf (r:0 w:1) // Storage: Identity IdentityIndexOf (r:0 w:1)
// Storage: Identity IdentitiesNames (r:0 w:1) // Storage: Identity IdentitiesNames (r:0 w:1)
fn remove_identity() -> Weight { fn force_remove_identity() -> Weight {
// Minimum execution time: 302_574 nanoseconds. // Minimum execution time: 302_574 nanoseconds.
Weight::from_parts(504_132_000 as u64, 0) Weight::from_parts(504_132_000 as u64, 0)
.saturating_add(RocksDbWeight::get().reads(9 as u64)) .saturating_add(RocksDbWeight::get().reads(9 as u64))
......
...@@ -195,7 +195,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> { ...@@ -195,7 +195,7 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
/// Proof Skipped: Identity IdentitiesNames (max_values: None, max_size: None, mode: Measured) /// Proof Skipped: Identity IdentitiesNames (max_values: None, max_size: None, mode: Measured)
/// Storage: Quota IdtyQuota (r:0 w:1) /// Storage: Quota IdtyQuota (r:0 w:1)
/// Proof: Quota IdtyQuota (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen) /// Proof: Quota IdtyQuota (max_values: None, max_size: Some(24), added: 2499, mode: MaxEncodedLen)
fn remove_identity() -> Weight { fn force_remove_identity() -> Weight {
// Proof Size summary in bytes: // Proof Size summary in bytes:
// Measured: `1343` // Measured: `1343`
// Estimated: `7283` // Estimated: `7283`
......
...@@ -283,13 +283,13 @@ fn test_session_change() { ...@@ -283,13 +283,13 @@ fn test_session_change() {
}) })
} }
/// test calling remove_identity /// test calling force_remove_identity
#[test] #[test]
fn test_remove_identity() { fn test_force_remove_identity() {
ExtBuilder::new(1, 3, 4).build().execute_with(|| { ExtBuilder::new(1, 3, 4).build().execute_with(|| {
run_to_block(2); run_to_block(2);
// remove the identity // remove the identity
assert_ok!(Identity::remove_identity( assert_ok!(Identity::force_remove_identity(
frame_system::RawOrigin::Root.into(), frame_system::RawOrigin::Root.into(),
4, 4,
None, None,
...@@ -493,7 +493,7 @@ fn test_remove_identity_after_one_ud() { ...@@ -493,7 +493,7 @@ fn test_remove_identity_after_one_ud() {
+ 1) as u32, + 1) as u32,
); );
// remove identity // remove identity
assert_ok!(Identity::remove_identity( assert_ok!(Identity::force_remove_identity(
frame_system::RawOrigin::Root.into(), frame_system::RawOrigin::Root.into(),
4, 4,
None, None,
...@@ -636,7 +636,7 @@ fn test_remove_smith_identity() { ...@@ -636,7 +636,7 @@ fn test_remove_smith_identity() {
ExtBuilder::new(1, 3, 4).build().execute_with(|| { ExtBuilder::new(1, 3, 4).build().execute_with(|| {
run_to_block(2); run_to_block(2);
assert_ok!(Identity::remove_identity( assert_ok!(Identity::force_remove_identity(
frame_system::RawOrigin::Root.into(), frame_system::RawOrigin::Root.into(),
3, 3,
None, None,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment