Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions cumulus/pallets/parachain-system/src/parachain_inherent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@ impl<Message: InboundMessage> AbridgedInboundMessagesCollection<Message> {
collection_name: &str,
size_info: AbridgedInboundMessagesSizeInfo,
) {
if self.hashed_messages.is_empty() {
return;
}

// We should check that the collection contains as many full messages as possible
// without exceeding the max expected size.
let AbridgedInboundMessagesSizeInfo { max_full_messages_size, first_hashed_msg_max_size } =
Expand Down Expand Up @@ -536,6 +540,22 @@ mod tests {

#[test]
fn check_enough_messages_included_advanced_works() {
let full_messages = AbridgedInboundHrmpMessages {
full_messages: vec![(
1000.into(),
InboundHrmpMessage { sent_at: 0, data: vec![1; 50] },
)],
hashed_messages: vec![],
};
// This should work if there are no hashed messages.
full_messages.check_enough_messages_included_advanced(
"Test",
AbridgedInboundMessagesSizeInfo {
max_full_messages_size: 100,
first_hashed_msg_max_size: 25,
},
);

let mixed_messages = AbridgedInboundHrmpMessages {
full_messages: vec![(
1000.into(),
Expand Down
10 changes: 10 additions & 0 deletions prdoc/pr_11024.prdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title: Fix `check_enough_messages_included_advanced()`
doc:
- audience: Todo
description: |-
Related to https://github.com/paritytech/polkadot-sdk/pull/9086

The check should succeed if there are no hashed messages.
crates:
- name: cumulus-pallet-parachain-system
bump: patch
Loading