Remove pallet::getter macro from pallet-identity

cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/src/tests/reap_identity.rs

@@ -41,14 +41,17 @@
 use crate::imports::*;
 use frame_support::BoundedVec;
 use pallet_balances::Event as BalancesEvent;
-use pallet_identity::{legacy::IdentityInfo, Data, Event as IdentityEvent};
-use people_rococo_runtime::people::{
-	BasicDeposit as BasicDepositParachain, ByteDeposit as ByteDepositParachain,
-	IdentityInfo as IdentityInfoParachain, SubAccountDeposit as SubAccountDepositParachain,
+use pallet_identity::{legacy::IdentityInfo, Data, Event as IdentityEvent, IdentityOf, SubsOf};
+use people_rococo_runtime::{
+	people::{
+		BasicDeposit as BasicDepositParachain, ByteDeposit as ByteDepositParachain,
+		IdentityInfo as IdentityInfoParachain, SubAccountDeposit as SubAccountDepositParachain,
+	},
+	Runtime as PeopleRuntime,
 };
 use rococo_runtime::{
-	BasicDeposit, ByteDeposit, MaxAdditionalFields, MaxSubAccounts, RuntimeOrigin as RococoOrigin,
-	SubAccountDeposit,
+	BasicDeposit, ByteDeposit, MaxAdditionalFields, MaxSubAccounts, Runtime as RococoRuntime,
+	RuntimeOrigin as RococoOrigin, SubAccountDeposit,
 };
 use rococo_runtime_constants::currency::*;
 use rococo_system_emulated_network::{
@@ -270,9 +273,9 @@ fn assert_set_id_parachain(id: &Identity) {
 		// No amount should be reserved as deposit amounts are set to 0.
 		let reserved_balance = PeopleRococoBalances::reserved_balance(PeopleRococoSender::get());
 		assert_eq!(reserved_balance, 0);
-		assert!(PeopleRococoIdentity::identity(PeopleRococoSender::get()).is_some());
+		assert!(IdentityOf::<PeopleRuntime>::get(PeopleRococoSender::get()).is_some());
 
-		let (_, sub_accounts) = PeopleRococoIdentity::subs_of(PeopleRococoSender::get());
+		let (_, sub_accounts) = SubsOf::<PeopleRuntime>::get(PeopleRococoSender::get());
 
 		match id.subs {
 			Subs::Zero => assert_eq!(sub_accounts.len(), 0),
@@ -318,10 +321,10 @@ fn assert_reap_id_relay(total_deposit: Balance, id: &Identity) {
 			]
 		);
 		// Identity should be gone.
-		assert!(PeopleRococoIdentity::identity(RococoRelaySender::get()).is_none());
+		assert!(IdentityOf::<PeopleRuntime>::get(RococoRelaySender::get()).is_none());
 
 		// Subs should be gone.
-		let (_, sub_accounts) = RococoIdentity::subs_of(RococoRelaySender::get());
+		let (_, sub_accounts) = SubsOf::<RococoRuntime>::get(RococoRelaySender::get());
 		assert_eq!(sub_accounts.len(), 0);
 
 		let reserved_balance = RococoBalances::reserved_balance(RococoRelaySender::get());

cumulus/parachains/integration-tests/emulated/tests/people/people-westend/src/tests/reap_identity.rs

@@ -41,14 +41,17 @@
 use crate::imports::*;
 use frame_support::BoundedVec;
 use pallet_balances::Event as BalancesEvent;
-use pallet_identity::{legacy::IdentityInfo, Data, Event as IdentityEvent};
-use people_westend_runtime::people::{
-	BasicDeposit as BasicDepositParachain, ByteDeposit as ByteDepositParachain,
-	IdentityInfo as IdentityInfoParachain, SubAccountDeposit as SubAccountDepositParachain,
+use pallet_identity::{legacy::IdentityInfo, Data, Event as IdentityEvent, IdentityOf, SubsOf};
+use people_westend_runtime::{
+	people::{
+		BasicDeposit as BasicDepositParachain, ByteDeposit as ByteDepositParachain,
+		IdentityInfo as IdentityInfoParachain, SubAccountDeposit as SubAccountDepositParachain,
+	},
+	Runtime as PeopleRuntime,
 };
 use westend_runtime::{
-	BasicDeposit, ByteDeposit, MaxAdditionalFields, MaxSubAccounts, RuntimeOrigin as WestendOrigin,
-	SubAccountDeposit,
+	BasicDeposit, ByteDeposit, MaxAdditionalFields, MaxSubAccounts, Runtime as WestendRuntime,
+	RuntimeOrigin as WestendOrigin, SubAccountDeposit,
 };
 use westend_runtime_constants::currency::*;
 use westend_system_emulated_network::{
@@ -270,9 +273,9 @@ fn assert_set_id_parachain(id: &Identity) {
 		// No amount should be reserved as deposit amounts are set to 0.
 		let reserved_balance = PeopleWestendBalances::reserved_balance(PeopleWestendSender::get());
 		assert_eq!(reserved_balance, 0);
-		assert!(PeopleWestendIdentity::identity(PeopleWestendSender::get()).is_some());
+		assert!(IdentityOf::<PeopleRuntime>::get(PeopleWestendSender::get()).is_some());
 
-		let (_, sub_accounts) = PeopleWestendIdentity::subs_of(PeopleWestendSender::get());
+		let (_, sub_accounts) = SubsOf::<PeopleRuntime>::get(PeopleWestendSender::get());
 
 		match id.subs {
 			Subs::Zero => assert_eq!(sub_accounts.len(), 0),
@@ -318,10 +321,10 @@ fn assert_reap_id_relay(total_deposit: Balance, id: &Identity) {
 			]
 		);
 		// Identity should be gone.
-		assert!(PeopleWestendIdentity::identity(WestendRelaySender::get()).is_none());
+		assert!(IdentityOf::<PeopleRuntime>::get(WestendRelaySender::get()).is_none());
 
 		// Subs should be gone.
-		let (_, sub_accounts) = WestendIdentity::subs_of(WestendRelaySender::get());
+		let (_, sub_accounts) = SubsOf::<WestendRuntime>::get(WestendRelaySender::get());
 		assert_eq!(sub_accounts.len(), 0);
 
 		let reserved_balance = WestendBalances::reserved_balance(WestendRelaySender::get());

prdoc/pr_4586.prdoc

@@ -0,0 +1,22 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Removed `pallet::getter` usage from pallet-identity
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      This PR removed the `pallet::getter`s from `pallet-identity`.
+      The syntax `StorageItem::<T, I>::get()` should be used instead.
+
+crates:
+  - name: pallet-identity
+    bump: major
+  - name: pallet-alliance
+    bump: patch
+  - name: kitchensink-runtime
+    bump: patch
+  - name: people-rococo-integration-tests
+    bump: patch
+  - name: people-westend-integration-tests
+    bump: patch

substrate/bin/node/runtime/src/impls.rs

@@ -64,8 +64,8 @@ impl IdentityVerifier<AccountId> for AllianceIdentityVerifier {
 	}
 
 	fn has_good_judgement(who: &AccountId) -> bool {
-		use pallet_identity::Judgement;
-		crate::Identity::identity(who)
+		use pallet_identity::{IdentityOf, Judgement};
+		IdentityOf::<Runtime>::get(who)
 			.map(|(registration, _)| registration.judgements)
 			.map_or(false, |judgements| {
 				judgements
@@ -75,7 +75,8 @@ impl IdentityVerifier<AccountId> for AllianceIdentityVerifier {
 	}
 
 	fn super_account_id(who: &AccountId) -> Option<AccountId> {
-		crate::Identity::super_of(who).map(|parent| parent.0)
+		use pallet_identity::SuperOf;
+		SuperOf::<Runtime>::get(who).map(|parent| parent.0)
 	}
 }
 

substrate/frame/alliance/src/mock.rs

@@ -31,7 +31,7 @@ pub use frame_support::{
 use frame_system::{EnsureRoot, EnsureSignedBy};
 use pallet_identity::{
 	legacy::{IdentityField, IdentityInfo},
-	Data, Judgement,
+	Data, IdentityOf, Judgement, SuperOf,
 };
 
 pub use crate as pallet_alliance;
@@ -146,7 +146,7 @@ impl IdentityVerifier<AccountId> for AllianceIdentityVerifier {
 
 	fn has_good_judgement(who: &AccountId) -> bool {
 		if let Some(judgements) =
-			Identity::identity(who).map(|(registration, _)| registration.judgements)
+			IdentityOf::<Test>::get(who).map(|(registration, _)| registration.judgements)
 		{
 			judgements
 				.iter()
@@ -157,7 +157,7 @@ impl IdentityVerifier<AccountId> for AllianceIdentityVerifier {
 	}
 
 	fn super_account_id(who: &AccountId) -> Option<AccountId> {
-		Identity::super_of(who).map(|parent| parent.0)
+		SuperOf::<Test>::get(who).map(|parent| parent.0)
 	}
 }
 

substrate/frame/identity/src/legacy.rs

@@ -172,7 +172,7 @@ impl<FieldLimit: Get<u32>> Default for IdentityInfo<FieldLimit> {
 
 impl<FieldLimit: Get<u32>> IdentityInfo<FieldLimit> {
 	pub(crate) fn fields(&self) -> BitFlags<IdentityField> {
-		let mut res = <BitFlags<IdentityField>>::empty();
+		let mut res = BitFlags::<IdentityField>::empty();
 		if !self.display.is_none() {
 			res.insert(IdentityField::Display);
 		}