refactor

bin/node/runtime/src/impls.rs

@@ -50,17 +50,10 @@ impl HandleCredit<AccountId, Assets> for CreditToBlockAuthor {
 
 pub struct AllianceIdentityVerifier;
 impl IdentityVerifier<AccountId> for AllianceIdentityVerifier {
-	#[cfg(not(feature = "runtime-benchmarks"))]
 	fn has_identity(who: &AccountId, fields: u64) -> bool {
 		crate::Identity::has_identity(who, fields)
 	}
 
-	#[cfg(feature = "runtime-benchmarks")]
-	fn has_identity(_who: &AccountId, _fields: u64) -> bool {
-		true
-	}
-
-	#[cfg(not(feature = "runtime-benchmarks"))]
 	fn has_good_judgement(who: &AccountId) -> bool {
 		use pallet_identity::Judgement;
 		if let Some(judgements) =
@@ -75,20 +68,9 @@ impl IdentityVerifier<AccountId> for AllianceIdentityVerifier {
 		}
 	}
 
-	#[cfg(feature = "runtime-benchmarks")]
-	fn has_good_judgement(_who: &AccountId) -> bool {
-		true
-	}
-
-	#[cfg(not(feature = "runtime-benchmarks"))]
 	fn super_account_id(who: &AccountId) -> Option<AccountId> {
 		crate::Identity::super_of(who).map(|parent| parent.0)
 	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	fn super_account_id(_who: &AccountId) -> Option<AccountId> {
-		None
-	}
 }
 
 pub struct AllianceProposalProvider;

bin/node/runtime/src/lib.rs

@@ -1426,7 +1426,10 @@ impl pallet_alliance::Config for Runtime {
 	type Slashed = Treasury;
 	type InitializeMembers = AllianceMotion;
 	type MembershipChanged = AllianceMotion;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type IdentityVerifier = AllianceIdentityVerifier;
+	#[cfg(feature = "runtime-benchmarks")]
+	type IdentityVerifier = ();
 	type ProposalProvider = AllianceProposalProvider;
 	type MaxProposals = AllianceMaxProposals;
 	type MaxFounders = MaxFounders;

frame/alliance/src/lib.rs

@@ -136,14 +136,28 @@ type NegativeImbalanceOf<T, I = ()> = <<T as Config<I>>::Currency as Currency<
 	<T as frame_system::Config>::AccountId,
 >>::NegativeImbalance;
 
-pub trait IdentityVerifier<AccountId: Clone + Ord> {
+pub trait IdentityVerifier<AccountId> {
 	fn has_identity(who: &AccountId, fields: u64) -> bool;
 
 	fn has_good_judgement(who: &AccountId) -> bool;
 
 	fn super_account_id(who: &AccountId) -> Option<AccountId>;
 }
 
+impl<AccountId> IdentityVerifier<AccountId> for () {
+	fn has_identity(_who: &AccountId, _fields: u64) -> bool {
+		true
+	}
+
+	fn has_good_judgement(_who: &AccountId) -> bool {
+		true
+	}
+
+	fn super_account_id(_who: &AccountId) -> Option<AccountId> {
+		None
+	}
+}
+
 pub trait ProposalProvider<AccountId, Hash, Proposal> {
 	fn propose_proposal(
 		who: AccountId,

frame/alliance/src/mock.rs

@@ -135,17 +135,10 @@ impl pallet_identity::Config for Test {
 
 pub struct AllianceIdentityVerifier;
 impl IdentityVerifier<u64> for AllianceIdentityVerifier {
-	#[cfg(not(feature = "runtime-benchmarks"))]
 	fn has_identity(who: &u64, fields: u64) -> bool {
 		Identity::has_identity(who, fields)
 	}
 
-	#[cfg(feature = "runtime-benchmarks")]
-	fn has_identity(_who: &u64, _fields: u64) -> bool {
-		true
-	}
-
-	#[cfg(not(feature = "runtime-benchmarks"))]
 	fn has_good_judgement(who: &u64) -> bool {
 		if let Some(judgements) =
 			Identity::identity(who).map(|registration| registration.judgements)
@@ -159,20 +152,9 @@ impl IdentityVerifier<u64> for AllianceIdentityVerifier {
 		}
 	}
 
-	#[cfg(feature = "runtime-benchmarks")]
-	fn has_good_judgement(_who: &u64) -> bool {
-		true
-	}
-
-	#[cfg(not(feature = "runtime-benchmarks"))]
 	fn super_account_id(who: &u64) -> Option<u64> {
 		Identity::super_of(who).map(|parent| parent.0)
 	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	fn super_account_id(_who: &u64) -> Option<u64> {
-		None
-	}
 }
 
 pub struct AllianceProposalProvider;
@@ -229,7 +211,10 @@ impl Config for Test {
 	type Slashed = ();
 	type InitializeMembers = AllianceMotion;
 	type MembershipChanged = AllianceMotion;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type IdentityVerifier = AllianceIdentityVerifier;
+	#[cfg(feature = "runtime-benchmarks")]
+	type IdentityVerifier = ();
 	type ProposalProvider = AllianceProposalProvider;
 	type MaxProposals = MaxProposals;
 	type MaxFounders = MaxFounders;