Fix compilation issues

Author: ntn-x2

crates/kilt-dip-primitives/src/verifier/relaychain/mod.rs

@@ -32,7 +32,7 @@ use crate::{
 	merkle_proofs::v0::RevealedDidKey,
 	traits::{DipCallOriginFilter, GetWithArg, GetWithoutArg, Incrementable},
 	utils::OutputOf,
-	DipOriginInfo,
+	DipOriginInfo, RelayDipDidProof,
 };
 
 pub mod v0;
@@ -55,7 +55,7 @@ pub enum VersionedRelaychainStateProof<
 	KiltLinkableAccountId,
 > {
 	V0(
-		crate::merkle_proofs::v0::RelayDipDidProof<
+		RelayDipDidProof<
 			ConsumerBlockNumber,
 			ConsumerBlockHasher,
 			KiltDidKeyId,
@@ -67,6 +67,51 @@ pub enum VersionedRelaychainStateProof<
 	),
 }
 
+impl<
+		ConsumerBlockNumber: Copy + Into<U256> + TryFrom<U256>,
+		ConsumerBlockHasher: Hash,
+		KiltDidKeyId,
+		KiltAccountId,
+		KiltBlockNumber,
+		KiltWeb3Name,
+		KiltLinkableAccountId,
+	>
+	From<
+		RelayDipDidProof<
+			ConsumerBlockNumber,
+			ConsumerBlockHasher,
+			KiltDidKeyId,
+			KiltAccountId,
+			KiltBlockNumber,
+			KiltWeb3Name,
+			KiltLinkableAccountId,
+		>,
+	>
+	for VersionedRelaychainStateProof<
+		ConsumerBlockNumber,
+		ConsumerBlockHasher,
+		KiltDidKeyId,
+		KiltAccountId,
+		KiltBlockNumber,
+		KiltWeb3Name,
+		KiltLinkableAccountId,
+	>
+{
+	fn from(
+		value: RelayDipDidProof<
+			ConsumerBlockNumber,
+			ConsumerBlockHasher,
+			KiltDidKeyId,
+			KiltAccountId,
+			KiltBlockNumber,
+			KiltWeb3Name,
+			KiltLinkableAccountId,
+		>,
+	) -> Self {
+		Self::V0(value)
+	}
+}
+
 pub const DEFAULT_MAX_PROVIDER_HEAD_PROOF_LEAVE_COUNT: u32 = 128;
 pub const DEFAULT_MAX_PROVIDER_HEAD_PROOF_LEAVE_SIZE: u32 = 1024;
 pub const DEFAULT_MAX_DIP_COMMITMENT_PROOF_LEAVE_COUNT: u32 = 128;

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

@@ -60,7 +60,8 @@ pub type ProviderTemplateProofVerifier = KiltVersionedParachainVerifier<
 pub type MerkleProofVerifierInput = <ProviderTemplateProofVerifier as IdentityProofVerifier<Runtime>>::Proof;
 pub type MerkleProofVerifierOutput =
 	<ProviderTemplateProofVerifier as IdentityProofVerifier<Runtime>>::VerificationResult;
-// Wrapper around the verifier to implement the `GetWorstCase` trait.
+// Wrapper around the verifier to implement the `GetWorstCase` trait (required
+// due to orphan rule).
 pub struct ProviderTemplateProofVerifierWrapper;
 
 // Delegate verification logic to the specialized version of
@@ -1008,6 +1009,8 @@ mod worst_case_tests {
 
 	use crate::{dip::MAX_PROVIDER_REVEALABLE_KEYS_COUNT, ProviderTemplateProofVerifierWrapper};
 
+	// Test that the worst case actually refers to the worst case that the provider
+	// can generate.
 	#[test]
 	fn worst_case_max_limits() {
 		sp_io::TestExternalities::default().execute_with(|| {