chore: improve benchmark logic (#612)

Fixes https://github.com/KILTprotocol/ticket/issues/3104, based on top
of #611.

It fixes the logic for the `dip-consumer` pallet, by delegating the
generation of a proof worst case to the proof verifier, which must make
sure the proof is indeed the one that requires the most weight to
verify, and that it verifies successfully. This also means that each
consumer runtime is responsible to implement this method, as there
cannot be a "universal" worst proof, as that depends on the use case.
The pallet benchmarking logic is now generic enough to make this
possible and flexible ✨✨✨

Author: ntn-x2

Cargo.lock

@@ -14,7 +14,6 @@ version.workspace = true
 # External dependencies
 hash-db.workspace = true
 log.workspace = true
-cfg-if.workspace = true
 
 # Internal dependencies
 did.workspace = true
@@ -78,5 +77,5 @@ std = [
 runtime-benchmarks = [
   "kilt-support/runtime-benchmarks",
   "pallet-dip-consumer/runtime-benchmarks",
-  "pallet-dip-provider/runtime-benchmarks",
+  "pallet-dip-provider/runtime-benchmarks"
 ]

crates/kilt-dip-primitives/Cargo.toml

@@ -20,6 +20,7 @@ use did::{
 	did_details::{DidPublicKey, DidPublicKeyDetails},
 	DidSignature,
 };
+use frame_support::ensure;
 use sp_core::ConstU32;
 use sp_runtime::{traits::SaturatedConversion, BoundedVec};
 use sp_std::vec::Vec;
@@ -29,7 +30,6 @@ use crate::{
 		input_common::TimeBoundDidSignature,
 		output_common::{DidKeyRelationship, DipOriginInfo, RevealedDidKey, RevealedDidMerkleProofLeaf},
 	},
-	traits::BenchmarkDefault,
 	Error,
 };
 
@@ -106,13 +106,7 @@ impl<
 		>,
 		Error,
 	> {
-		cfg_if::cfg_if! {
-			if #[cfg(feature = "runtime-benchmarks")] {
-				let _ = self.signature.valid_until >= *block_number;
-			} else {
-				frame_support::ensure!(self.signature.valid_until >= *block_number, Error::InvalidSignatureTime);
-			}
-		}
+		ensure!(self.signature.valid_until >= *block_number, Error::InvalidSignatureTime);
 		Ok(DipRevealedDetailsAndVerifiedDidSignatureFreshness {
 			revealed_leaves: self.revealed_leaves,
 			signature: self.signature.signature,
@@ -166,9 +160,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.
@@ -214,15 +206,7 @@ impl<
 			.map(|(index, _)| u32::saturated_from(index))
 			.collect();
 
-		if signing_leaves_indices.is_empty() {
-			cfg_if::cfg_if! {
-				if #[cfg(feature = "runtime-benchmarks")] {
-						return Ok(DipOriginInfo::default());
-				} else {
-					return Err(Error::InvalidDidKeyRevealed);
-				}
-			}
-		}
+		ensure!(!signing_leaves_indices.is_empty(), Error::InvalidDidKeyRevealed);
 
 		let signing_leaves_indices_vector = signing_leaves_indices.try_into().map_err(|_| {
 			log::error!("Should never fail to convert vector of signing leaf indices into BoundedVec.");

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

@@ -21,7 +21,7 @@ use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_std::vec::Vec;
 
-use crate::{merkle_proofs::v0::output_common::RevealedDidMerkleProofLeaf, utils::BoundedBlindedValue};
+use crate::merkle_proofs::v0::output_common::RevealedDidMerkleProofLeaf;
 
 /// The state proof for a parachain head.
 ///
@@ -31,31 +31,26 @@ use crate::{merkle_proofs::v0::output_common::RevealedDidMerkleProofLeaf, utils:
 #[cfg_attr(test, derive(Default))]
 pub struct ProviderHeadStateProof<RelayBlockNumber> {
 	pub(crate) relay_block_number: RelayBlockNumber,
-	pub(crate) proof: BoundedBlindedValue<u8>,
+	pub(crate) proof: Vec<Vec<u8>>,
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-impl<RelayBlockNumber, Context> kilt_support::traits::GetWorstCase<Context> for ProviderHeadStateProof<RelayBlockNumber>
-where
-	RelayBlockNumber: Default,
-{
-	fn worst_case(context: Context) -> Self {
+impl<RelayBlockNumber> ProviderHeadStateProof<RelayBlockNumber> {
+	pub fn new(relay_block_number: RelayBlockNumber, proof: Vec<Vec<u8>>) -> Self {
 		Self {
-			relay_block_number: RelayBlockNumber::default(),
-			proof: BoundedBlindedValue::worst_case(context),
+			proof,
+			relay_block_number,
 		}
 	}
 }
 
 /// The state proof for a DIP commitment.
 #[derive(Clone, Debug, Encode, Decode, PartialEq, Eq, TypeInfo)]
 #[cfg_attr(test, derive(Default))]
-pub struct DipCommitmentStateProof(pub(crate) BoundedBlindedValue<u8>);
+pub struct DipCommitmentStateProof(pub(crate) Vec<Vec<u8>>);
 
-#[cfg(feature = "runtime-benchmarks")]
-impl<Context> kilt_support::traits::GetWorstCase<Context> for DipCommitmentStateProof {
-	fn worst_case(context: Context) -> Self {
-		Self(BoundedBlindedValue::worst_case(context))
+impl DipCommitmentStateProof {
+	pub fn new(proof: Vec<Vec<u8>>) -> Self {
+		Self(proof)
 	}
 }
 
@@ -76,7 +71,7 @@ pub struct DidMerkleProof<
 	ProviderWeb3Name,
 	ProviderLinkableAccountId,
 > {
-	pub(crate) blinded: BoundedBlindedValue<u8>,
+	pub(crate) blinded: Vec<Vec<u8>>,
 	pub(crate) revealed: Vec<
 		RevealedDidMerkleProofLeaf<
 			ProviderDidKeyId,
@@ -92,7 +87,7 @@ impl<ProviderDidKeyId, ProviderAccountId, ProviderBlockNumber, ProviderWeb3Name,
 	DidMerkleProof<ProviderDidKeyId, ProviderAccountId, ProviderBlockNumber, ProviderWeb3Name, ProviderLinkableAccountId>
 {
 	pub fn new(
-		blinded: BoundedBlindedValue<u8>,
+		blinded: Vec<Vec<u8>>,
 		revealed: Vec<
 			RevealedDidMerkleProofLeaf<
 				ProviderDidKeyId,
@@ -105,35 +100,17 @@ impl<ProviderDidKeyId, ProviderAccountId, ProviderBlockNumber, ProviderWeb3Name,
 	) -> Self {
 		Self { blinded, revealed }
 	}
-}
 
-#[cfg(feature = "runtime-benchmarks")]
-impl<
+	pub fn revealed(
+		&self,
+	) -> &[RevealedDidMerkleProofLeaf<
 		ProviderDidKeyId,
 		ProviderAccountId,
 		ProviderBlockNumber,
 		ProviderWeb3Name,
 		ProviderLinkableAccountId,
-		Context,
-	> kilt_support::traits::GetWorstCase<Context>
-	for DidMerkleProof<
-		ProviderDidKeyId,
-		ProviderAccountId,
-		ProviderBlockNumber,
-		ProviderWeb3Name,
-		ProviderLinkableAccountId,
-	> where
-	ProviderDidKeyId: Default + Clone,
-	ProviderAccountId: Clone,
-	ProviderBlockNumber: Default + Clone,
-	ProviderWeb3Name: Clone,
-	ProviderLinkableAccountId: Clone,
-{
-	fn worst_case(context: Context) -> Self {
-		Self {
-			blinded: BoundedBlindedValue::worst_case(context),
-			revealed: sp_std::vec![RevealedDidMerkleProofLeaf::default(); 64],
-		}
+	>] {
+		self.revealed.as_ref()
 	}
 }
 
@@ -188,17 +165,3 @@ where
 		}
 	}
 }
-
-#[cfg(feature = "runtime-benchmarks")]
-impl<BlockNumber, Context> kilt_support::traits::GetWorstCase<Context> for TimeBoundDidSignature<BlockNumber>
-where
-	DidSignature: kilt_support::traits::GetWorstCase<Context>,
-	BlockNumber: Default,
-{
-	fn worst_case(context: Context) -> Self {
-		Self {
-			signature: DidSignature::worst_case(context),
-			valid_until: BlockNumber::default(),
-		}
-	}
-}