diff --git a/bridges/snowbridge/pallets/outbound-queue/src/mock.rs b/bridges/snowbridge/pallets/outbound-queue/src/mock.rs
index 67877a05c79a19ff64a121705f5b8f5a6356170c..5eeeeead140018e81a8aaaf302d678e3a4321e08 100644
--- a/bridges/snowbridge/pallets/outbound-queue/src/mock.rs
+++ b/bridges/snowbridge/pallets/outbound-queue/src/mock.rs
@@ -69,6 +69,7 @@ impl pallet_message_queue::Config for Test {
type HeapSize = HeapSize;
type MaxStale = MaxStale;
type ServiceWeight = ServiceWeight;
+ type IdleMaxServiceWeight = ();
type QueuePausedQuery = ();
}
diff --git a/bridges/snowbridge/pallets/system/src/mock.rs b/bridges/snowbridge/pallets/system/src/mock.rs
index 0312456c98233a1e8538a741a2b19e0611aa670b..687072a49e2e5ca9e27d7f1be94ea89564c2275f 100644
--- a/bridges/snowbridge/pallets/system/src/mock.rs
+++ b/bridges/snowbridge/pallets/system/src/mock.rs
@@ -148,6 +148,7 @@ impl pallet_message_queue::Config for Test {
type HeapSize = HeapSize;
type MaxStale = MaxStale;
type ServiceWeight = ServiceWeight;
+ type IdleMaxServiceWeight = ();
type QueuePausedQuery = ();
}
diff --git a/cumulus/pallets/parachain-system/src/mock.rs b/cumulus/pallets/parachain-system/src/mock.rs
index 0b1d536ba7cd9153d1409a65a87bc8234a09bd95..fe89dfe68c67e4b5d9f9e046dcf2a780a292da0a 100644
--- a/cumulus/pallets/parachain-system/src/mock.rs
+++ b/cumulus/pallets/parachain-system/src/mock.rs
@@ -125,6 +125,7 @@ impl pallet_message_queue::Config for Test {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MaxWeight;
+ type IdleMaxServiceWeight = ();
type WeightInfo = ();
}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
index 689d8d56c48ba9fd4bbb129a7c1d0f8eec5ec426..293416ab2a9aa10c35620f574ed138f33587600e 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
@@ -660,6 +660,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl parachain_info::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index 48106b5f302d45bc7d4af104f9bb47e51854ab76..e92e801e9f522e64846fb8cbe933cf4238e11509 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -641,6 +641,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
index 3980fa0d501a1db10f6cb48bdde87946031be8f4..f0aa4f8e91ccc64d8d181c615ced4c9129759c1b 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -387,6 +387,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
index 9bdea6b9a7dd72f7f280b456f6624f12153dbbba..3b759301d0edc9ba088e30c75d188a36c1929dad 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
@@ -348,6 +348,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
index d3f588bf25ff21768f700a8b1c97007678bee17d..e1c2e1a6237b1d7a7bb9d1bbbdbe92e33858c23e 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
@@ -423,6 +423,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
index e1586c7d9b29e1b72eab189f68db034d8414e264..ec0a5f6fc96cd1f333410036ecef57ca202e1d95 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
@@ -318,6 +318,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs
index 86eb5cdfcaf5ebf0a2cbbed87c2642eed6452405..67f486893532b423969d6d9f21d29457d2fb90df 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs
@@ -301,6 +301,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl parachain_info::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs
index c31e474cc2f1718b5de4a8ebb88a19072deba1ba..609ea5a38a897e088baebbfa713d728feb00f47d 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs
@@ -301,6 +301,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl parachain_info::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs
index cee17cdc7b05de2b9f0736248583cb984547f5f9..ca1a915ba740ac6d9243fe60fe4db4dbe7e9857d 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs
@@ -212,6 +212,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl parachain_info::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs
index cd5f1ad3272805d59c4fc3f16043ee875cc6dab1..7c9427a2493965aff82d8762aa04a86d9eea873f 100644
--- a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs
@@ -282,6 +282,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
}
diff --git a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs
index e840a40f5acdf0684d3e50a079e9eed56a4896ab..3e331e5e8ebf1f17520a376ef044add6bf00c877 100644
--- a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs
@@ -282,6 +282,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
type WeightInfo = weights::pallet_message_queue::WeightInfo<Runtime>;
}
diff --git a/cumulus/parachains/runtimes/starters/shell/src/lib.rs b/cumulus/parachains/runtimes/starters/shell/src/lib.rs
index 0f4957fd802b441e17fe05f791a7e1dbd047a29e..ad79d6849bd5fc9733ec724a6869f615eb856a54 100644
--- a/cumulus/parachains/runtimes/starters/shell/src/lib.rs
+++ b/cumulus/parachains/runtimes/starters/shell/src/lib.rs
@@ -232,6 +232,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
index 1d404feac3db1b7d6a59af2b88eaa6adf59fbf2b..0a55d2dcfe53ee5ba7bf98a223a300f02e97d05f 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
@@ -540,6 +540,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
index c6006141981766320713ec4f7b59af3ee049bc74..034d16267d450a03a395b6b9f7401231c5cfea69 100644
--- a/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
+++ b/cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
@@ -320,6 +320,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = ();
}
impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/polkadot/runtime/parachains/src/mock.rs b/polkadot/runtime/parachains/src/mock.rs
index 7ed62a392e4e532b244b628d7f02a0dea2209c34..461b9f4b431acea91614b295d47e3d4c273adccf 100644
--- a/polkadot/runtime/parachains/src/mock.rs
+++ b/polkadot/runtime/parachains/src/mock.rs
@@ -365,6 +365,7 @@ impl pallet_message_queue::Config for Test {
type HeapSize = ConstU32<65536>;
type MaxStale = ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = ();
}
parameter_types! {
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 8c8abe97ede22d3df445742ffc72a0696df6c91f..c41ffdbe72db4adb8dc1863dd511c59d4079f8c5 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -987,6 +987,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = MessageQueueHeapSize;
type MaxStale = MessageQueueMaxStale;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
#[cfg(not(feature = "runtime-benchmarks"))]
type MessageProcessor = MessageProcessor;
#[cfg(feature = "runtime-benchmarks")]
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 02397f35368e91e4af202409b120811012fb51a5..e6381513170f871666042a49326fae0320f4649c 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -1190,6 +1190,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = MessageQueueHeapSize;
type MaxStale = MessageQueueMaxStale;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = MessageQueueServiceWeight;
#[cfg(not(feature = "runtime-benchmarks"))]
type MessageProcessor = MessageProcessor;
#[cfg(feature = "runtime-benchmarks")]
diff --git a/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs b/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs
index 377c77f30a473d178b5fa3c56a79abe7e2c2766a..286d0038e187a45504e9b1092fed4b152ffe9d3d 100644
--- a/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs
+++ b/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs
@@ -275,6 +275,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = MessageQueueHeapSize;
type MaxStale = MessageQueueMaxStale;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = ();
type MessageProcessor = MessageProcessor;
type QueueChangeHandler = ();
type QueuePausedQuery = ();
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
index 3224df66cbe56fd50ecdc5931274f41332143134..6790b535d169220a3def3e4780af1aa1ef83e759 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
+++ b/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs
@@ -232,6 +232,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = MessageQueueHeapSize;
type MaxStale = MessageQueueMaxStale;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = ();
#[cfg(not(feature = "runtime-benchmarks"))]
type MessageProcessor = MessageProcessor;
#[cfg(feature = "runtime-benchmarks")]
diff --git a/prdoc/pr_3844.prdoc b/prdoc/pr_3844.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..a92092f91b207e44957bccce59b25cdd983fdac4
--- /dev/null
+++ b/prdoc/pr_3844.prdoc
@@ -0,0 +1,25 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Add the ability for MessageQueue to process enqueued messages on idle
+
+doc:
+ - audience: Runtime Dev
+ description: |
+ Add the option to use remaining weight on idle for processing enqueued messages.
+ This will increase the chances of the messages enqueued during inherent extrinsics to be processed in the same block.
+ New config types is added on the message-queue `Config` trait:
+ - `IdleMaxServiceWeight`
+
+ example:
+ ```rust
+ parameter_types! {
+ // The maximum weight to be used from remaining weight for processing enqueued messages on idle
+ pub const IdleMaxServiceWeight: Weight = Some(Weight);
+ }
+
+ type IdleMaxServiceWeight = IdleMaxServiceWeight; // or `()` to not use this feature
+ ```
+
+crates:
+ - name: pallet-message-queue
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index ca7e14f6eb169f4edac300272c2455e5fff0975f..a9606ac0bb759dbc468db1c8c238b8ea35b0b6a1 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -1303,6 +1303,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = ConstU32<{ 64 * 1024 }>;
type MaxStale = ConstU32<128>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = ();
}
parameter_types! {
diff --git a/substrate/frame/contracts/mock-network/src/relay_chain.rs b/substrate/frame/contracts/mock-network/src/relay_chain.rs
index e2a8d3d1337bb6901d4f0b24d16198595accba1b..470304ed357ec5594a2a66f795f838bc8be7740b 100644
--- a/substrate/frame/contracts/mock-network/src/relay_chain.rs
+++ b/substrate/frame/contracts/mock-network/src/relay_chain.rs
@@ -225,6 +225,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = MessageQueueHeapSize;
type MaxStale = MessageQueueMaxStale;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = ();
type MessageProcessor = MessageProcessor;
type QueueChangeHandler = ();
type WeightInfo = ();
diff --git a/substrate/frame/message-queue/src/integration_test.rs b/substrate/frame/message-queue/src/integration_test.rs
index 26a330cc88e8ed2a53c2d19b2d3b90272c7e7778..14b8d2217eb2b3908377014feb90c73588c79eff 100644
--- a/substrate/frame/message-queue/src/integration_test.rs
+++ b/substrate/frame/message-queue/src/integration_test.rs
@@ -73,6 +73,7 @@ impl Config for Test {
type HeapSize = HeapSize;
type MaxStale = MaxStale;
type ServiceWeight = ServiceWeight;
+ type IdleMaxServiceWeight = ();
}
/// Simulates heavy usage by enqueueing and processing large amounts of messages.
diff --git a/substrate/frame/message-queue/src/lib.rs b/substrate/frame/message-queue/src/lib.rs
index 93cd760eeb96c74ef0f64fdde0705ec00835a45b..ec85c785f79eb6eea628d9a8df6db0667d2bf70e 100644
--- a/substrate/frame/message-queue/src/lib.rs
+++ b/substrate/frame/message-queue/src/lib.rs
@@ -525,12 +525,21 @@ pub mod pallet {
type MaxStale: Get<u32>;
/// The amount of weight (if any) which should be provided to the message queue for
- /// servicing enqueued items.
+ /// servicing enqueued items `on_initialize`.
///
/// This may be legitimately `None` in the case that you will call
- /// `ServiceQueues::service_queues` manually.
+ /// `ServiceQueues::service_queues` manually or set [`Self::IdleMaxServiceWeight`] to have
+ /// it run in `on_idle`.
#[pallet::constant]
type ServiceWeight: Get<Option<Weight>>;
+
+ /// The maximum amount of weight (if any) to be used from remaining weight `on_idle` which
+ /// should be provided to the message queue for servicing enqueued items `on_idle`.
+ /// Useful for parachains to process messages at the same block they are received.
+ ///
+ /// If `None`, it will not call `ServiceQueues::service_queues` in `on_idle`.
+ #[pallet::constant]
+ type IdleMaxServiceWeight: Get<Option<Weight>>;
}
#[pallet::event]
@@ -643,6 +652,15 @@ pub mod pallet {
}
}
+ fn on_idle(_n: BlockNumberFor<T>, remaining_weight: Weight) -> Weight {
+ if let Some(weight_limit) = T::IdleMaxServiceWeight::get() {
+ // Make use of the remaining weight to process enqueued messages.
+ Self::service_queues(weight_limit.min(remaining_weight))
+ } else {
+ Weight::zero()
+ }
+ }
+
#[cfg(feature = "try-runtime")]
fn try_state(_: BlockNumberFor<T>) -> Result<(), sp_runtime::TryRuntimeError> {
Self::do_try_state()
diff --git a/substrate/frame/message-queue/src/mock.rs b/substrate/frame/message-queue/src/mock.rs
index f22f318b8ef12511e840f21d874b0d3c2fa31519..1281de6b0a66f37e265071b390981138b30dad2e 100644
--- a/substrate/frame/message-queue/src/mock.rs
+++ b/substrate/frame/message-queue/src/mock.rs
@@ -56,6 +56,7 @@ impl Config for Test {
type HeapSize = HeapSize;
type MaxStale = MaxStale;
type ServiceWeight = ServiceWeight;
+ type IdleMaxServiceWeight = ServiceWeight;
}
/// Mocked `WeightInfo` impl with allows to set the weight per call.
diff --git a/substrate/frame/message-queue/src/tests.rs b/substrate/frame/message-queue/src/tests.rs
index 1f6e7777f0125a949cd5c1cec545337d7d716140..d6788847d57173da6a7a06740daf55946f15b15f 100644
--- a/substrate/frame/message-queue/src/tests.rs
+++ b/substrate/frame/message-queue/src/tests.rs
@@ -1838,3 +1838,45 @@ fn with_service_mutex_works() {
with_service_mutex(|| called = 3).unwrap();
assert_eq!(called, 3);
}
+
+#[test]
+fn process_enqueued_on_idle() {
+ use MessageOrigin::*;
+ build_and_execute::<Test>(|| {
+ // Some messages enqueued on previous block.
+ MessageQueue::enqueue_messages(vec![msg("a"), msg("ab"), msg("abc")].into_iter(), Here);
+ assert_eq!(BookStateFor::<Test>::iter().count(), 1);
+
+ // Process enqueued messages from previous block.
+ Pallet::<Test>::on_initialize(1);
+ assert_eq!(
+ MessagesProcessed::take(),
+ vec![(b"a".to_vec(), Here), (b"ab".to_vec(), Here), (b"abc".to_vec(), Here),]
+ );
+
+ MessageQueue::enqueue_messages(vec![msg("x"), msg("xy"), msg("xyz")].into_iter(), There);
+ assert_eq!(BookStateFor::<Test>::iter().count(), 2);
+
+ // Enough weight to process on idle.
+ Pallet::<Test>::on_idle(1, Weight::from_parts(100, 100));
+ assert_eq!(
+ MessagesProcessed::take(),
+ vec![(b"x".to_vec(), There), (b"xy".to_vec(), There), (b"xyz".to_vec(), There)]
+ );
+ })
+}
+
+#[test]
+fn process_enqueued_on_idle_requires_enough_weight() {
+ use MessageOrigin::*;
+ build_and_execute::<Test>(|| {
+ Pallet::<Test>::on_initialize(1);
+
+ MessageQueue::enqueue_messages(vec![msg("x"), msg("xy"), msg("xyz")].into_iter(), There);
+ assert_eq!(BookStateFor::<Test>::iter().count(), 1);
+
+ // Not enough weight to process on idle.
+ Pallet::<Test>::on_idle(1, Weight::from_parts(0, 0));
+ assert_eq!(MessagesProcessed::take(), vec![]);
+ })
+}
diff --git a/templates/parachain/runtime/src/lib.rs b/templates/parachain/runtime/src/lib.rs
index ad21b79a5b1baf48759e7696c7233a9bdf9bdc38..88b0f5a14749f6466e0d40d52ddd17dfaafdf6b6 100644
--- a/templates/parachain/runtime/src/lib.rs
+++ b/templates/parachain/runtime/src/lib.rs
@@ -414,6 +414,7 @@ impl pallet_message_queue::Config for Runtime {
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
type MaxStale = sp_core::ConstU32<8>;
type ServiceWeight = MessageQueueServiceWeight;
+ type IdleMaxServiceWeight = ();
}
impl cumulus_pallet_aura_ext::Config for Runtime {}