From 9957abf1c5c1ce6584ee42f14933f3fd52605bb8 Mon Sep 17 00:00:00 2001 From: bgallois <benjamin@gallois.cc> Date: Mon, 4 Dec 2023 18:28:06 +0100 Subject: [PATCH] refactor calls pallet-identity --- pallets/duniter-wot/src/lib.rs | 2 +- pallets/identity/src/benchmarking.rs | 2 +- pallets/identity/src/lib.rs | 4 ++-- pallets/identity/src/weights.rs | 4 ++-- runtime/common/src/weights/pallet_identity.rs | 2 +- runtime/gdev/tests/integration_tests.rs | 10 +++++----- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pallets/duniter-wot/src/lib.rs b/pallets/duniter-wot/src/lib.rs index ac92850bf..946fa6686 100644 --- a/pallets/duniter-wot/src/lib.rs +++ b/pallets/duniter-wot/src/lib.rs @@ -346,7 +346,7 @@ where sp_membership::Event::<IdtyIndex>::MembershipRenewed(_) => {} sp_membership::Event::<IdtyIndex>::MembershipRequested(_) => {} 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_name: None, reason: pallet_identity::IdtyRemovalReason::Other( diff --git a/pallets/identity/src/benchmarking.rs b/pallets/identity/src/benchmarking.rs index 735f40c0e..2ec4a1352 100644 --- a/pallets/identity/src/benchmarking.rs +++ b/pallets/identity/src/benchmarking.rs @@ -225,7 +225,7 @@ benchmarks! { 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 account: Account<T> = create_one_identity(new_identity)?; let identities = Pallet::<T>::identities_count(); diff --git a/pallets/identity/src/lib.rs b/pallets/identity/src/lib.rs index 92acd4ae0..e60ab74ac 100644 --- a/pallets/identity/src/lib.rs +++ b/pallets/identity/src/lib.rs @@ -551,9 +551,9 @@ pub mod pallet { } #[pallet::call_index(5)] - #[pallet::weight(T::WeightInfo::remove_identity())] + #[pallet::weight(T::WeightInfo::force_remove_identity())] /// remove an identity from storage - pub fn remove_identity( + pub fn force_remove_identity( origin: OriginFor<T>, idty_index: T::IdtyIndex, idty_name: Option<IdtyName>, diff --git a/pallets/identity/src/weights.rs b/pallets/identity/src/weights.rs index 266b0eb51..729d3a8ef 100644 --- a/pallets/identity/src/weights.rs +++ b/pallets/identity/src/weights.rs @@ -25,7 +25,7 @@ pub trait WeightInfo { fn validate_identity() -> Weight; fn change_owner_key() -> Weight; fn revoke_identity() -> Weight; - fn remove_identity() -> Weight; + fn force_remove_identity() -> Weight; fn prune_item_identities_names(i: u32) -> Weight; fn fix_sufficients() -> Weight; fn link_account() -> Weight; @@ -120,7 +120,7 @@ impl WeightInfo for () { // Storage: Parameters ParametersStorage (r:1 w:0) // Storage: Identity IdentityIndexOf (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. Weight::from_parts(504_132_000 as u64, 0) .saturating_add(RocksDbWeight::get().reads(9 as u64)) diff --git a/runtime/common/src/weights/pallet_identity.rs b/runtime/common/src/weights/pallet_identity.rs index 3dc9f9848..332be4f48 100644 --- a/runtime/common/src/weights/pallet_identity.rs +++ b/runtime/common/src/weights/pallet_identity.rs @@ -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) /// Storage: Quota IdtyQuota (r:0 w:1) /// 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: // Measured: `1343` // Estimated: `7283` diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs index 355ff5ae6..374902776 100644 --- a/runtime/gdev/tests/integration_tests.rs +++ b/runtime/gdev/tests/integration_tests.rs @@ -283,13 +283,13 @@ fn test_session_change() { }) } -/// test calling remove_identity +/// test calling force_remove_identity #[test] -fn test_remove_identity() { +fn test_force_remove_identity() { ExtBuilder::new(1, 3, 4).build().execute_with(|| { run_to_block(2); // remove the identity - assert_ok!(Identity::remove_identity( + assert_ok!(Identity::force_remove_identity( frame_system::RawOrigin::Root.into(), 4, None, @@ -493,7 +493,7 @@ fn test_remove_identity_after_one_ud() { + 1) as u32, ); // remove identity - assert_ok!(Identity::remove_identity( + assert_ok!(Identity::force_remove_identity( frame_system::RawOrigin::Root.into(), 4, None, @@ -636,7 +636,7 @@ fn test_remove_smith_identity() { ExtBuilder::new(1, 3, 4).build().execute_with(|| { run_to_block(2); - assert_ok!(Identity::remove_identity( + assert_ok!(Identity::force_remove_identity( frame_system::RawOrigin::Root.into(), 3, None, -- GitLab