Messags benchmarks

Author: bkontur

runtimes/bulletin-polkadot/src/lib.rs

@@ -643,14 +643,13 @@ mod benches {
 
 		[pallet_bridge_grandpa, BridgePolkadotGrandpa]
 		[pallet_bridge_parachains, PolkadotParachains]
-		// [pallet_bridge_messages, BridgeMessagesBench::<Runtime, bridge_config::WithPeoplePolkadotMessagesInstance>]
+		[pallet_bridge_messages, PolkadotMessages]
 	);
 
 	pub use frame_benchmarking::{baseline::Pallet as Baseline, BenchmarkBatch, BenchmarkList};
 	pub use frame_system_benchmarking::Pallet as SystemBench;
 
 	pub use frame_support::traits::{StorageInfoTrait, WhitelistedStorageKeys};
-	pub use pallet_bridge_messages::benchmarking::Pallet as BridgeMessagesBench;
 	pub use sp_storage::TrackedStorageKey;
 
 	impl frame_system_benchmarking::Config for Runtime {}
@@ -684,10 +683,69 @@ mod benches {
 		}
 	}
 
+	use bridge_runtime_common::messages_benchmarking::{
+		generate_xcm_builder_bridge_message_sample, prepare_message_delivery_proof_from_parachain,
+		prepare_message_proof_from_parachain,
+	};
+	use pallet_bridge_messages::{
+		benchmarking::{
+			Config as BridgeMessagesConfig, MessageDeliveryProofParams, MessageProofParams,
+		},
+		LaneIdOf,
+	};
+
+	impl BridgeMessagesConfig<bridge_config::WithPeoplePolkadotMessagesInstance> for Runtime {
+		fn is_relayer_rewarded(_relayer: &Self::AccountId) -> bool {
+			// TODO:
+			// no rewards, so we don't care
+			true
+		}
+
+		fn prepare_message_proof(
+			params: MessageProofParams<
+				LaneIdOf<Runtime, bridge_config::WithPeoplePolkadotMessagesInstance>,
+			>,
+		) -> (bridge_config::benchmarking::FromPeoplePolkadotMessagesProof, Weight) {
+			prepare_message_proof_from_parachain::<
+				Runtime,
+				bridge_config::WithPolkadotBridgeGrandpaInstance,
+				bridge_config::WithPeoplePolkadotMessagesInstance,
+			>(
+				params,
+				generate_xcm_builder_bridge_message_sample(
+					bridge_config::PeoplePolkadotLocation::get().interior().clone(),
+				),
+			)
+		}
+
+		fn prepare_message_delivery_proof(
+			params: MessageDeliveryProofParams<
+				AccountId,
+				LaneIdOf<Runtime, bridge_config::WithPeoplePolkadotMessagesInstance>,
+			>,
+		) -> bridge_config::benchmarking::ToPeoplePolkadotMessagesDeliveryProof {
+			prepare_message_delivery_proof_from_parachain::<
+				Runtime,
+				bridge_config::WithPolkadotBridgeGrandpaInstance,
+				bridge_config::WithPeoplePolkadotMessagesInstance,
+			>(params)
+		}
+
+		fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
+			// TODO:
+			// currently we have no means to detect that
+			true
+		}
+	}
+
 	pub type PolkadotParachains = pallet_bridge_parachains::benchmarking::Pallet<
 		Runtime,
 		bridge_config::WithPolkadotBridgeParachainsInstance,
 	>;
+	pub type PolkadotMessages = pallet_bridge_messages::benchmarking::Pallet<
+		Runtime,
+		bridge_config::WithPeoplePolkadotMessagesInstance,
+	>;
 }
 
 #[cfg(feature = "runtime-benchmarks")]

runtimes/bulletin-polkadot/src/polkadot_bridge_config.rs

@@ -324,7 +324,7 @@ impl<BlobDispatcher: DispatchBlob, Weights: pallet_bridge_messages::WeightInfoEx
 pub type WithPeoplePolkadotMessagesInstance = ();
 impl pallet_bridge_messages::Config<WithPeoplePolkadotMessagesInstance> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = crate::weights::bridge_polkadot_messages::WeightInfo<Runtime>;
+	type WeightInfo = crate::weights::pallet_bridge_messages::WeightInfo<Runtime>;
 
 	type ThisChain = bp_polkadot_bulletin::PolkadotBulletin;
 	type BridgedChain = bp_people_polkadot::PeoplePolkadot;
@@ -439,67 +439,24 @@ pub type ToBridgeHaulBlobExporter = HaulBlobExporter<
 	(),
 >;
 
-// #[cfg(feature = "runtime-benchmarks")]
-// pub mod benchmarking {
-// 	use super::*;
-//
-// 	/// Proof of messages, coming from BridgeHubPolkadot.
-// 	pub type FromBridgeHubPolkadotMessagesProof =
-// 		bridge_runtime_common::messages::target::FromBridgedChainMessagesProof<
-// 			bp_people_polkadot::Hash,
-// 		>;
-//
-// 	/// Message delivery proof for `BridgeHubPolkadot` messages.
-// 	pub type ToBridgeHubPolkadotMessagesDeliveryProof =
-// 		bridge_runtime_common::messages::source::FromBridgedChainMessagesDeliveryProof<
-// 			bp_people_polkadot::Hash,
-// 		>;
-//
-// 	use bridge_runtime_common::messages_benchmarking::{
-// 		generate_xcm_builder_bridge_message_sample, prepare_message_delivery_proof_from_parachain,
-// 		prepare_message_proof_from_parachain,
-// 	};
-// 	use pallet_bridge_messages::benchmarking::{
-// 		Config as BridgeMessagesConfig, MessageDeliveryProofParams, MessageProofParams,
-// 	};
-//
-// 	impl BridgeMessagesConfig<WithBridgeHubPolkadotMessagesInstance> for Runtime {
-// 		fn is_relayer_rewarded(_relayer: &Self::AccountId) -> bool {
-// 			// no rewards, so we don't care
-// 			true
-// 		}
-//
-// 		fn prepare_message_proof(
-// 			params: MessageProofParams,
-// 		) -> (FromBridgeHubPolkadotMessagesProof, Weight) {
-// 			prepare_message_proof_from_parachain::<
-// 				Runtime,
-// 				WithPolkadotBridgeGrandpaInstance,
-// 				WithBridgeHubPolkadotMessageBridge,
-// 			>(
-// 				params,
-// 				generate_xcm_builder_bridge_message_sample(
-// 					*crate::xcm_config::KawabungaLocation::get().interior(),
-// 				),
-// 			)
-// 		}
-//
-// 		fn prepare_message_delivery_proof(
-// 			params: MessageDeliveryProofParams<AccountId>,
-// 		) -> ToBridgeHubPolkadotMessagesDeliveryProof {
-// 			prepare_message_delivery_proof_from_parachain::<
-// 				Runtime,
-// 				WithPolkadotBridgeGrandpaInstance,
-// 				WithBridgeHubPolkadotMessageBridge,
-// 			>(params)
-// 		}
-//
-// 		fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
-// 			// currently we have no means to detect that
-// 			true
-// 		}
-// 	}
-// }
+#[cfg(feature = "runtime-benchmarks")]
+pub mod benchmarking {
+	use super::*;
+
+	/// Proof of messages, coming from PeoplePolkadot.
+	pub type FromPeoplePolkadotMessagesProof =
+		bp_messages::target_chain::FromBridgedChainMessagesProof<
+			bp_people_polkadot::Hash,
+			pallet_bridge_messages::LaneIdOf<Runtime, WithPeoplePolkadotMessagesInstance>,
+		>;
+
+	/// Message delivery proof for `PeoplePolkadot` messages.
+	pub type ToPeoplePolkadotMessagesDeliveryProof =
+		bp_messages::source_chain::FromBridgedChainMessagesDeliveryProof<
+			bp_people_polkadot::Hash,
+			pallet_bridge_messages::LaneIdOf<Runtime, WithPeoplePolkadotMessagesInstance>,
+		>;
+}
 //
 // #[cfg(test)]
 // pub(crate) mod tests {