Merge branch 'master' into multi_phase_default_snapshot_as_fallback

Author: kianenigma

Cargo.lock

@@ -5,7 +5,7 @@ use alloy_core::primitives::FixedBytes;
 use codec::Encode;
 use frame_support::{
 	assert_err, assert_ok,
-	traits::{Hooks, ProcessMessage, ProcessMessageError},
+	traits::{Hooks, ProcessMessage, ProcessMessageError, QueueFootprintQuery},
 	weights::WeightMeter,
 	BoundedVec,
 };

bridges/snowbridge/pallets/outbound-queue-v2/src/test.rs

@@ -4,7 +4,7 @@ use crate::{mock::*, *};
 
 use frame_support::{
 	assert_err, assert_noop, assert_ok,
-	traits::{Hooks, ProcessMessage, ProcessMessageError},
+	traits::{Hooks, ProcessMessage, ProcessMessageError, QueueFootprintQuery},
 	weights::WeightMeter,
 };
 

bridges/snowbridge/pallets/outbound-queue/src/test.rs

@@ -6,8 +6,8 @@ use sp_runtime::{
 };
 use xcm::{latest::WESTEND_GENESIS_HASH, prelude::*};
 
-pub const CHAIN_ID: u64 = 11155111;
-pub const NETWORK: NetworkId = Ethereum { chain_id: CHAIN_ID };
+pub const SEPOLIA_ID: u64 = 11155111;
+pub const NETWORK: NetworkId = Ethereum { chain_id: SEPOLIA_ID };
 
 parameter_types! {
 	pub EthereumNetwork: NetworkId = NETWORK;

bridges/snowbridge/primitives/inbound-queue/src/mock.rs

@@ -95,7 +95,7 @@ fn test_convert_send_token_with_weth() {
 	const FEE: u128 = 1_000;
 	const ACCOUNT_ID: [u8; 32] = [0xBA; 32];
 	const MESSAGE: VersionedMessage = VersionedMessage::V1(MessageV1 {
-		chain_id: CHAIN_ID,
+		chain_id: SEPOLIA_ID,
 		command: Command::SendToken {
 			token: WETH,
 			destination: Destination::AccountId32 { id: ACCOUNT_ID },
@@ -132,7 +132,7 @@ fn test_convert_send_token_with_eth() {
 	const FEE: u128 = 1_000;
 	const ACCOUNT_ID: [u8; 32] = [0xBA; 32];
 	const MESSAGE: VersionedMessage = VersionedMessage::V1(MessageV1 {
-		chain_id: CHAIN_ID,
+		chain_id: SEPOLIA_ID,
 		command: Command::SendToken {
 			token: ETH,
 			destination: Destination::AccountId32 { id: ACCOUNT_ID },

bridges/snowbridge/primitives/inbound-queue/src/tests.rs

@@ -17,10 +17,7 @@
 
 #![cfg(test)]
 
-use frame_support::{
-	derive_impl, parameter_types,
-	traits::{HandleMessage, QueueFootprint},
-};
+use frame_support::{derive_impl, parameter_types, traits::HandleMessage};
 use sp_core::{bounded_vec::BoundedSlice, ConstU32};
 use sp_runtime::traits::IdentityLookup;
 
@@ -72,10 +69,6 @@ impl HandleMessage for RecordingDmpSink {
 	fn sweep_queue() {
 		unimplemented!()
 	}
-
-	fn footprint() -> QueueFootprint {
-		unimplemented!()
-	}
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {

cumulus/pallets/dmp-queue/src/mock.rs

@@ -45,43 +45,138 @@ mod benchmarks {
 	/// The message will be added on a new page and also, the `BookState` will be added
 	/// to the ready ring.
 	#[benchmark]
-	fn enqueue_n_bytes_xcmp_message(n: Linear<1, { MaxXcmpMessageLenOf::<T>::get() }>) {
+	fn enqueue_n_bytes_xcmp_message(n: Linear<0, { MaxXcmpMessageLenOf::<T>::get() }>) {
 		#[cfg(test)]
 		{
 			mock::EnqueuedMessages::set(vec![]);
 		}
 
-		let msg = BoundedVec::<u8, MaxXcmpMessageLenOf<T>>::try_from(vec![0; n as usize]).unwrap();
+		let msg = BoundedVec::try_from(vec![0; n as usize]).unwrap();
+
+		#[cfg(not(test))]
 		let fp_before = T::XcmpQueue::footprint(0.into());
 		#[block]
 		{
-			assert_ok!(Pallet::<T>::enqueue_xcmp_message(0.into(), msg));
+			assert_ok!(Pallet::<T>::enqueue_xcmp_messages(
+				0.into(),
+				&[msg],
+				&mut WeightMeter::new()
+			));
+		}
+		#[cfg(not(test))]
+		{
+			let fp_after = T::XcmpQueue::footprint(0.into());
+			assert_eq!(fp_after.ready_pages, fp_before.ready_pages + 1);
 		}
-		let fp_after = T::XcmpQueue::footprint(0.into());
-		assert_eq!(fp_after.ready_pages, fp_before.ready_pages + 1);
 	}
 
-	/// Add 2 XCMP message of 0 bytes to the message queue.
+	/// Add `n` XCMP message of 0 bytes to the message queue.
 	///
 	/// Only for the first message a new page will be created and the `BookState` will be added
 	/// to the ready ring.
 	#[benchmark]
-	fn enqueue_2_empty_xcmp_messages() {
+	fn enqueue_n_empty_xcmp_messages(n: Linear<0, 1000>) {
+		#[cfg(test)]
+		{
+			mock::EnqueuedMessages::set(vec![]);
+			<QueueConfig<T>>::set(QueueConfigData {
+				suspend_threshold: 1100,
+				drop_threshold: 1100,
+				resume_threshold: 1100,
+			});
+		}
+
+		let msgs = vec![Default::default(); n as usize];
+
+		#[cfg(not(test))]
+		let fp_before = T::XcmpQueue::footprint(0.into());
+		#[block]
+		{
+			assert_ok!(Pallet::<T>::enqueue_xcmp_messages(
+				0.into(),
+				&msgs,
+				&mut WeightMeter::new()
+			));
+		}
+		#[cfg(not(test))]
+		{
+			let fp_after = T::XcmpQueue::footprint(0.into());
+			if !msgs.is_empty() {
+				assert_eq!(fp_after.ready_pages, fp_before.ready_pages + 1);
+			}
+		}
+	}
+
+	/// Add `n` pages to the message queue.
+	///
+	/// We add one page by enqueueing a maximal size message which fills it.
+	#[benchmark]
+	fn enqueue_n_full_pages(n: Linear<0, 100>) {
 		#[cfg(test)]
 		{
 			mock::EnqueuedMessages::set(vec![]);
 		}
+		<QueueConfig<T>>::set(QueueConfigData {
+			suspend_threshold: 200,
+			drop_threshold: 200,
+			resume_threshold: 200,
+		});
 
-		let msg_1 = BoundedVec::<u8, MaxXcmpMessageLenOf<T>>::default();
-		let msg_2 = BoundedVec::<u8, MaxXcmpMessageLenOf<T>>::default();
+		let max_msg_len = MaxXcmpMessageLenOf::<T>::get() as usize;
+		let mut msgs = vec![];
+		for _i in 0..n {
+			let msg = BoundedVec::try_from(vec![0; max_msg_len]).unwrap();
+			msgs.push(msg);
+		}
+
+		#[cfg(not(test))]
 		let fp_before = T::XcmpQueue::footprint(0.into());
 		#[block]
 		{
-			assert_ok!(Pallet::<T>::enqueue_xcmp_message(0.into(), msg_1));
-			assert_ok!(Pallet::<T>::enqueue_xcmp_message(0.into(), msg_2));
+			assert_ok!(Pallet::<T>::enqueue_xcmp_messages(
+				0.into(),
+				&msgs,
+				&mut WeightMeter::new()
+			));
+		}
+		#[cfg(not(test))]
+		{
+			let fp_after = T::XcmpQueue::footprint(0.into());
+			assert_eq!(fp_after.ready_pages, fp_before.ready_pages + n);
+		}
+	}
+
+	#[benchmark]
+	fn enqueue_1000_small_xcmp_messages() {
+		#[cfg(test)]
+		{
+			<QueueConfig<T>>::set(QueueConfigData {
+				suspend_threshold: 1100,
+				drop_threshold: 1100,
+				resume_threshold: 1100,
+			});
+		}
+
+		let mut msgs = vec![];
+		for _i in 0..1000 {
+			msgs.push(BoundedVec::try_from(vec![0; 3]).unwrap());
+		}
+
+		#[cfg(not(test))]
+		let fp_before = T::XcmpQueue::footprint(0.into());
+		#[block]
+		{
+			assert_ok!(Pallet::<T>::enqueue_xcmp_messages(
+				0.into(),
+				&msgs,
+				&mut WeightMeter::new()
+			));
+		}
+		#[cfg(not(test))]
+		{
+			let fp_after = T::XcmpQueue::footprint(0.into());
+			assert_eq!(fp_after.ready_pages, fp_before.ready_pages + 1);
 		}
-		let fp_after = T::XcmpQueue::footprint(0.into());
-		assert_eq!(fp_after.ready_pages, fp_before.ready_pages + 1);
 	}
 
 	#[benchmark]