add lane id to OnDeliveredMessages callback

Author: svyatonik

modules/messages/src/lib.rs

@@ -641,7 +641,7 @@ decl_module! {
 			};
 			if let Some(confirmed_messages) = confirmed_messages {
 				// handle messages delivery
-				T::OnMessagesDelivered::on_messages_delivered(&confirmed_messages);
+				T::OnMessagesDelivered::on_messages_delivered(&lane_id, &confirmed_messages);
 
 				// emit 'delivered' event
 				let received_range = confirmed_messages.begin..=confirmed_messages.end;
@@ -1909,10 +1909,10 @@ mod tests {
 			));
 
 			// ensure that both callbacks have been called twice: for 1+2, then for 3
-			crate::mock::TestOnMessagesDelivered1::ensure_called(&delivered_messages_1_and_2);
-			crate::mock::TestOnMessagesDelivered1::ensure_called(&delivered_message_3);
-			crate::mock::TestOnMessagesDelivered2::ensure_called(&delivered_messages_1_and_2);
-			crate::mock::TestOnMessagesDelivered2::ensure_called(&delivered_message_3);
+			crate::mock::TestOnMessagesDelivered1::ensure_called(&TEST_LANE_ID, &delivered_messages_1_and_2);
+			crate::mock::TestOnMessagesDelivered1::ensure_called(&TEST_LANE_ID, &delivered_message_3);
+			crate::mock::TestOnMessagesDelivered2::ensure_called(&TEST_LANE_ID, &delivered_messages_1_and_2);
+			crate::mock::TestOnMessagesDelivered2::ensure_called(&TEST_LANE_ID, &delivered_message_3);
 		});
 	}
 }

modules/messages/src/mock.rs

@@ -354,15 +354,15 @@ pub struct TestOnMessagesDelivered1;
 
 impl TestOnMessagesDelivered1 {
 	/// Verify that the callback has been called with given delivered messages.
-	pub fn ensure_called(messages: &DeliveredMessages) {
-		let key = (b"TestOnMessagesDelivered1", messages).encode();
+	pub fn ensure_called(lane: &LaneId, messages: &DeliveredMessages) {
+		let key = (b"TestOnMessagesDelivered1", lane, messages).encode();
 		assert_eq!(frame_support::storage::unhashed::get(&key), Some(true));
 	}
 }
 
 impl OnMessagesDelivered for TestOnMessagesDelivered1 {
-	fn on_messages_delivered(messages: &DeliveredMessages) {
-		let key = (b"TestOnMessagesDelivered1", messages).encode();
+	fn on_messages_delivered(lane: &LaneId, messages: &DeliveredMessages) {
+		let key = (b"TestOnMessagesDelivered1", lane, messages).encode();
 		frame_support::storage::unhashed::put(&key, &true);
 	}
 }
@@ -373,15 +373,15 @@ pub struct TestOnMessagesDelivered2;
 
 impl TestOnMessagesDelivered2 {
 	/// Verify that the callback has been called with given delivered messages.
-	pub fn ensure_called(messages: &DeliveredMessages) {
-		let key = (b"TestOnMessagesDelivered2", messages).encode();
+	pub fn ensure_called(lane: &LaneId, messages: &DeliveredMessages) {
+		let key = (b"TestOnMessagesDelivered2", lane, messages).encode();
 		assert_eq!(frame_support::storage::unhashed::get(&key), Some(true));
 	}
 }
 
 impl OnMessagesDelivered for TestOnMessagesDelivered2 {
-	fn on_messages_delivered(messages: &DeliveredMessages) {
-		let key = (b"TestOnMessagesDelivered2", messages).encode();
+	fn on_messages_delivered(lane: &LaneId, messages: &DeliveredMessages) {
+		let key = (b"TestOnMessagesDelivered2", lane, messages).encode();
 		frame_support::storage::unhashed::put(&key, &true);
 	}
 }

primitives/messages/src/source_chain.rs

@@ -141,7 +141,7 @@ pub trait OnMessagesDelivered {
 	/// Called when we receive confirmation that our messages have been delivered to the
 	/// target chain. The confirmation aso has single bit dispatch result for every
 	/// confirmed message (see `DeliveredMessages` for details).
-	fn on_messages_delivered(_messages: &DeliveredMessages) {}
+	fn on_messages_delivered(_lane: &LaneId, _messages: &DeliveredMessages) {}
 }
 
 /// Structure that may be used in place of `TargetHeaderChain`, `LaneMessageVerifier` and