Co #14318: pallet-message-queue: add queue pausing (#7433)

* Increase recusive limit to 512 for macro expansions Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Increase limit to 1024 Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Adjust comment Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Increase more limits Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> * Add QueuePausedQuery * ... on westend Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * update lockfile for {"substrate"} * update lockfile for {"substrate"} * Add QueuePausedQuery * ... on westend Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix test error Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * CI buggy Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> --------- Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io> Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Alexandru Vasile <alexandru.vasile@parity.io> Co-authored-by: parity-processbot <>
paritytech · Jun 28, 2023 · 3fd67a8 · 3fd67a8
1 parent 82dd94a
commit 3fd67a8
Show file tree

Hide file tree

Showing 9 changed files with 205 additions and 190 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -17,8 +17,8 @@
 //! The Kusama runtime. This can be compiled with `#[no_std]`, ready for Wasm.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+// `construct_runtime!` does a lot of recursion and requires us to increase the limit.
+#![recursion_limit = "512"]
 
 use pallet_nis::WithMaximumOf;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
@@ -1145,6 +1145,7 @@ impl pallet_message_queue::Config for Runtime {
 	type MessageProcessor =
 		pallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
 	type QueueChangeHandler = ParaInclusion;
+	type QueuePausedQuery = ();
 	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
 }
 

diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs
@@ -329,6 +329,7 @@ impl pallet_message_queue::Config for Test {
 	type WeightInfo = TestMessageQueueWeight;
 	type MessageProcessor = TestProcessMessage;
 	type QueueChangeHandler = ParaInclusion;
+	type QueuePausedQuery = ();
 	type HeapSize = ConstU32<65536>;
 	type MaxStale = ConstU32<8>;
 	type ServiceWeight = MessageQueueServiceWeight;

diff --git a/runtime/parachains/src/ump_tests.rs b/runtime/parachains/src/ump_tests.rs
@@ -573,13 +573,21 @@ fn overweight_queue_works() {
 			.into(),
 		);
 
-		// ... and if we try to service a message with index that doesn't exist it will error
-		// out.
+		// But servicing again will not work.
 		assert_noop!(
 			<MessageQueue as ServiceQueues>::execute_overweight(
 				Weight::from_parts(501, 501),
 				(Ump(UmpQueueId::Para(para_a)), 0, 2)
 			),
+			ExecuteOverweightError::AlreadyProcessed,
+		);
+
+		// Using an invalid index does not work.
+		assert_noop!(
+			<MessageQueue as ServiceQueues>::execute_overweight(
+				Weight::from_parts(501, 501),
+				(Ump(UmpQueueId::Para(para_a)), 0, 3)
+			),
 			ExecuteOverweightError::NotFound,
 		);
 	});

diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
@@ -18,7 +18,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+#![recursion_limit = "512"]
 
 use pallet_transaction_payment::CurrencyAdapter;
 use runtime_common::{
@@ -1161,6 +1161,7 @@ impl pallet_message_queue::Config for Runtime {
 	type MessageProcessor =
 		pallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
 	type QueueChangeHandler = ParaInclusion;
+	type QueuePausedQuery = ();
 	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
 }
 

diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
@@ -17,8 +17,8 @@
 //! The Rococo runtime for v1 parachains.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+// `construct_runtime!` does a lot of recursion and requires us to increase the limit.
+#![recursion_limit = "512"]
 
 use pallet_nis::WithMaximumOf;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
@@ -1076,6 +1076,7 @@ impl pallet_message_queue::Config for Runtime {
 	type MessageProcessor =
 		pallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
 	type QueueChangeHandler = ParaInclusion;
+	type QueuePausedQuery = ();
 	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
 }
 

diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
@@ -974,6 +974,7 @@ impl pallet_message_queue::Config for Runtime {
 	type MessageProcessor =
 		pallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
 	type QueueChangeHandler = ParaInclusion;
+	type QueuePausedQuery = ();
 	type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
 }
 

diff --git a/xcm/xcm-simulator/example/src/relay_chain.rs b/xcm/xcm-simulator/example/src/relay_chain.rs
@@ -279,6 +279,7 @@ impl pallet_message_queue::Config for Runtime {
 	type ServiceWeight = MessageQueueServiceWeight;
 	type MessageProcessor = MessageProcessor;
 	type QueueChangeHandler = ();
+	type QueuePausedQuery = ();
 	type WeightInfo = ();
 }
 

diff --git a/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
@@ -247,6 +247,7 @@ impl pallet_message_queue::Config for Runtime {
 	type MessageProcessor =
 		pallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
 	type QueueChangeHandler = ();
+	type QueuePausedQuery = ();
 	type WeightInfo = ();
 }