Project compiling

Author: ntn-x2

crates/kilt-dip-primitives/src/merkle/v0/dip_subject_state/mod.rs

@@ -30,7 +30,6 @@ use crate::{
 		input_common::TimeBoundDidSignature,
 		output_common::{DidKeyRelationship, DipOriginInfo, RevealedDidKey, RevealedDidMerkleProofLeaf},
 	},
-	traits::BenchmarkDefault,
 	Error,
 };
 
@@ -195,9 +194,7 @@ impl<
 		KiltWeb3Name,
 		KiltLinkableAccountId,
 		MAX_REVEALED_LEAVES_COUNT,
-	> where
-	KiltDidKeyId: BenchmarkDefault,
-	KiltBlockNumber: BenchmarkDefault,
+	>
 {
 	/// Iterates over the revealed DID leaves to find the ones that generated a
 	/// valid signature for the provided payload.

crates/kilt-dip-primitives/src/merkle/v0/provider_state/mod.rs

@@ -33,7 +33,7 @@ use crate::{
 		input_common::{DidMerkleProof, DipCommitmentStateProof, ProviderHeadStateProof, TimeBoundDidSignature},
 	},
 	state_proofs::{verify_storage_value_proof, verify_storage_value_proof_with_decoder},
-	traits::{BenchmarkDefault, GetWithArg},
+	traits::GetWithArg,
 	utils::{
 		calculate_dip_identity_commitment_storage_key_for_runtime, calculate_parachain_head_storage_key, OutputOf,
 	},
@@ -178,8 +178,7 @@ impl<
 		KiltWeb3Name,
 		KiltLinkableAccountId,
 		ConsumerBlockNumber,
-	> where
-	KiltBlockNumber: BenchmarkDefault,
+	>
 {
 	/// Verifies the head data of the state proof for the provider with the
 	/// given para ID and relaychain state root.
@@ -354,7 +353,6 @@ impl<
 		StateRoot: Ord,
 		ParachainHasher: Hash<Output = StateRoot>,
 		ProviderRuntime: pallet_dip_provider::Config,
-		IdentityCommitmentOf<ProviderRuntime>: BenchmarkDefault,
 	{
 		let dip_commitment_storage_key =
 			calculate_dip_identity_commitment_storage_key_for_runtime::<ProviderRuntime>(subject, 0);

crates/kilt-dip-primitives/src/merkle/v0/relay_state/mod.rs

@@ -29,7 +29,7 @@ use crate::{
 		input_common::{DidMerkleProof, DipCommitmentStateProof, ProviderHeadStateProof, TimeBoundDidSignature},
 		provider_state::ParachainDipDidProof,
 	},
-	traits::{BenchmarkDefault, GetWithArg},
+	traits::GetWithArg,
 	utils::OutputOf,
 	DipDidProofWithVerifiedStateRoot, Error,
 };
@@ -238,8 +238,7 @@ impl<
 		KiltBlockNumber,
 		KiltWeb3Name,
 		KiltLinkableAccountId,
-	> where
-	KiltBlockNumber: BenchmarkDefault,
+	>
 {
 	/// Verifies the head data of the state proof for the provider with the
 	/// given para ID.

dip-template/runtimes/dip-consumer/src/dip.rs

@@ -21,8 +21,8 @@ use did::{
 	DidSignature, DidVerificationKeyRelationship, KeyIdOf,
 };
 use dip_provider_runtime_template::{
-	AccountId as ProviderAccountId, MaxTotalKeyAgreementKeys, Runtime as ProviderRuntime,
-	MAX_REVEALABLE_LINKED_ACCOUNTS,
+	AccountId as ProviderAccountId, Runtime as ProviderRuntime, MAX_REVEALABLE_LINKED_ACCOUNTS,
+	MAX_TOTAL_KEY_AGREEMENT_KEYS,
 };
 use frame_support::{pallet_prelude::ValueQuery, storage_alias, traits::Contains};
 use frame_system::{pallet_prelude::BlockNumberFor, EnsureSigned};
@@ -48,7 +48,7 @@ use crate::{weights, AccountId, DidIdentifier, Runtime, RuntimeCall, RuntimeOrig
 
 // 3 is the attestation, delegation, and authentication key.
 // 1 is the web3name.
-const MAX_PROVIDER_REVEALABLE_KEYS_COUNT: u32 = MaxTotalKeyAgreementKeys + 3 + 1 + MAX_REVEALABLE_LINKED_ACCOUNTS;
+const MAX_PROVIDER_REVEALABLE_KEYS_COUNT: u32 = MAX_TOTAL_KEY_AGREEMENT_KEYS + 3 + 1 + MAX_REVEALABLE_LINKED_ACCOUNTS;
 
 /// The verifier logic is tied to the provider template runtime definition.
 pub type ProviderTemplateProofVerifier = KiltVersionedParachainVerifier<
@@ -403,11 +403,11 @@ impl kilt_support::traits::GetWorstCase for ProviderTemplateProofVerifierWrapper
 
 #[cfg(all(test, feature = "runtime-benchmarks"))]
 mod worst_case_tests {
-	use kilt_dip_primitives::{parachain::DEFAULT_MAX_DID_MERKLE_LEAVES_REVEALED, VersionedDipParachainStateProof};
+	use kilt_dip_primitives::VersionedDipParachainStateProof;
 	use kilt_support::traits::GetWorstCase;
 	use pallet_dip_consumer::benchmarking::WorstCaseOf;
 
-	use crate::ProviderTemplateProofVerifierWrapper;
+	use crate::{dip::MAX_PROVIDER_REVEALABLE_KEYS_COUNT, ProviderTemplateProofVerifierWrapper};
 
 	#[test]
 	fn worst_case_max_limits() {
@@ -420,7 +420,7 @@ mod worst_case_tests {
 			sp_io::TestExternalities::default().execute_with(|| {
 				assert_eq!(
 					proof.dip_proof().revealed().len(),
-					MAX_PROVIDER_REVEALABLE_KEYS as usize
+					MAX_PROVIDER_REVEALABLE_KEYS_COUNT as usize
 				);
 			});
 		});

dip-template/runtimes/dip-provider/src/lib.rs

@@ -376,9 +376,10 @@ impl did::DeriveDidCallAuthorizationVerificationKeyRelationship for RuntimeCall
 	}
 }
 
+pub const MAX_TOTAL_KEY_AGREEMENT_KEYS: u32 = 50;
 parameter_types! {
 	#[derive(Debug, Clone, Eq, PartialEq)]
-	pub const MaxTotalKeyAgreementKeys: u32 = 50;
+	pub const MaxTotalKeyAgreementKeys: u32 = MAX_TOTAL_KEY_AGREEMENT_KEYS;
 	#[derive(Debug, Clone, Eq, PartialEq, TypeInfo, Encode, Decode)]
 	pub const MaxNewKeyAgreementKeys: u32 = 50;
 }