Fixes/comments from PR

Author: bkontur

modules/messages/src/inbound_lane.rs

@@ -20,8 +20,8 @@ use crate::Config;
 
 use bp_messages::{
 	target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
-	DeliveredMessages, InboundLaneData, LaneId, MessageKey, MessageNonce, OutboundLaneData,
-	UnrewardedRelayer,
+	DeliveredMessages, InboundLaneData, LaneId, MessageKey, MessageNonce, NotDispatchedReason,
+	OutboundLaneData, ReceivedMessageResult, UnrewardedRelayer,
 };
 use bp_runtime::messages::MessageDispatchResult;
 use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
@@ -124,6 +124,19 @@ pub enum ReceivalResult {
 	TooManyUnconfirmedMessages,
 }
 
+impl From<ReceivalResult> for ReceivedMessageResult {
+	fn from(value: ReceivalResult) -> Self {
+		match value {
+			ReceivalResult::Dispatched(_) => ReceivedMessageResult::Dispatched,
+			ReceivalResult::InvalidNonce => NotDispatchedReason::InvalidNonce.into(),
+			ReceivalResult::TooManyUnrewardedRelayers =>
+				NotDispatchedReason::TooManyUnrewardedRelayers.into(),
+			ReceivalResult::TooManyUnconfirmedMessages =>
+				NotDispatchedReason::TooManyUnconfirmedMessages.into(),
+		}
+	}
+}
+
 /// Inbound messages lane.
 pub struct InboundLane<S> {
 	storage: S,

modules/messages/src/lib.rs

@@ -91,7 +91,7 @@ pub const LOG_TARGET: &str = "runtime::bridge-messages";
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use bp_messages::{NotDispatchedReason, ReceivedMessageResult, ReceivedMessages};
+	use bp_messages::{ReceivedMessageResult, ReceivedMessages};
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
 
@@ -317,18 +317,16 @@ pub mod pallet {
 				}
 
 				let mut lane_messages_received_status =
-					Vec::with_capacity(lane_data.messages.len());
+					ReceivedMessages::new(lane_id, Vec::with_capacity(lane_data.messages.len()));
 				let mut is_lane_processing_stopped_no_weight_left = false;
 
 				for mut message in lane_data.messages {
 					debug_assert_eq!(message.key.lane_id, lane_id);
 					total_messages += 1;
 
 					if is_lane_processing_stopped_no_weight_left {
-						lane_messages_received_status.push((
-							message.key.nonce,
-							NotDispatchedReason::NotEnoughWeightForLane.into(),
-						));
+						lane_messages_received_status
+							.push_skipped_for_not_enough_weight(message.key.nonce);
 						continue
 					}
 
@@ -344,10 +342,8 @@ pub mod pallet {
 							message_dispatch_weight,
 							dispatch_weight_left,
 						);
-						lane_messages_received_status.push((
-							message.key.nonce,
-							NotDispatchedReason::NotEnoughWeightForLane.into(),
-						));
+						lane_messages_received_status
+							.push_skipped_for_not_enough_weight(message.key.nonce);
 						is_lane_processing_stopped_no_weight_left = true;
 						continue
 					}
@@ -369,31 +365,16 @@ pub mod pallet {
 						ReceivalResult::Dispatched(dispatch_result) => {
 							valid_messages += 1;
 							lane_messages_received_status
-								.push((message.key.nonce, ReceivedMessageResult::Dispatched));
+								.push(message.key.nonce, ReceivedMessageResult::Dispatched);
 							(
 								dispatch_result.unspent_weight,
 								!dispatch_result.dispatch_fee_paid_during_dispatch,
 							)
 						},
-						ReceivalResult::InvalidNonce => {
-							lane_messages_received_status.push((
-								message.key.nonce,
-								NotDispatchedReason::InvalidNonce.into(),
-							));
-							(message_dispatch_weight, true)
-						},
-						ReceivalResult::TooManyUnrewardedRelayers => {
-							lane_messages_received_status.push((
-								message.key.nonce,
-								NotDispatchedReason::TooManyUnrewardedRelayers.into(),
-							));
-							(message_dispatch_weight, true)
-						},
-						ReceivalResult::TooManyUnconfirmedMessages => {
-							lane_messages_received_status.push((
-								message.key.nonce,
-								NotDispatchedReason::TooManyUnconfirmedMessages.into(),
-							));
+						rr @ ReceivalResult::InvalidNonce |
+						rr @ ReceivalResult::TooManyUnrewardedRelayers |
+						rr @ ReceivalResult::TooManyUnconfirmedMessages => {
+							lane_messages_received_status.push(message.key.nonce, rr.into());
 							(message_dispatch_weight, true)
 						},
 					};
@@ -412,8 +393,7 @@ pub mod pallet {
 					);
 				}
 
-				messages_received_status
-					.push(ReceivedMessages::new(lane_id, lane_messages_received_status));
+				messages_received_status.push(lane_messages_received_status);
 			}
 
 			log::debug!(

primitives/messages/src/lib.rs

@@ -221,13 +221,25 @@ pub struct UnrewardedRelayer<RelayerId> {
 /// Received messages with their dispatch result.
 #[derive(Clone, Default, Encode, Decode, RuntimeDebug, PartialEq, Eq, TypeInfo)]
 pub struct ReceivedMessages<Result> {
+	/// Id of the lane which is receiving messages.
 	pub lane: LaneId,
+	/// Result of messages which we tried to dispatch
 	pub receive_results: Vec<(MessageNonce, Result)>,
+	/// Messages which were skipped and never dispatched
+	pub skipped_for_not_enough_weight: Vec<MessageNonce>,
 }
 
 impl<Result> ReceivedMessages<Result> {
 	pub fn new(lane: LaneId, receive_results: Vec<(MessageNonce, Result)>) -> Self {
-		ReceivedMessages { lane, receive_results }
+		ReceivedMessages { lane, receive_results, skipped_for_not_enough_weight: Vec::new() }
+	}
+
+	pub fn push(&mut self, message: MessageNonce, result: Result) {
+		self.receive_results.push((message, result));
+	}
+
+	pub fn push_skipped_for_not_enough_weight(&mut self, message: MessageNonce) {
+		self.skipped_for_not_enough_weight.push(message);
 	}
 }
 
@@ -252,8 +264,6 @@ pub enum NotDispatchedReason {
 	TooManyUnrewardedRelayers,
 	/// There are too many unconfirmed messages at the lane.
 	TooManyUnconfirmedMessages,
-	/// There are too many unconfirmed messages at the lane.
-	NotEnoughWeightForLane,
 }
 
 impl From<NotDispatchedReason> for ReceivedMessageResult {

scripts/send-message-from-millau-rialto.sh

@@ -6,6 +6,8 @@
 # we have (to make sure the message relays are running), but remove the message
 # generator service. From there you may submit messages manually using this script.
 
+# TODO: Fix demeo scripts https://github.com/paritytech/parity-bridges-common/issues/1406
+
 MILLAU_PORT="${RIALTO_PORT:-9945}"
 
 case "$1" in

scripts/send-message-from-rialto-millau.sh

@@ -6,6 +6,8 @@
 # we have (to make sure the message relays are running), but remove the message
 # generator service. From there you may submit messages manually using this script.
 
+# TODO: Fix demeo scripts https://github.com/paritytech/parity-bridges-common/issues/1406
+
 RIALTO_PORT="${RIALTO_PORT:-9944}"
 
 case "$1" in