From 4929493f831b82f6c77a1bce7a496fa9fb0c654c Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Tue, 5 Jul 2022 12:41:58 +0300
Subject: [PATCH] backport named events PR (#1489)

---
 bridges/modules/messages/src/lib.rs | 32 +++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/bridges/modules/messages/src/lib.rs b/bridges/modules/messages/src/lib.rs
index e02c94d02276..26e62a07d7b6 100644
--- a/bridges/modules/messages/src/lib.rs
+++ b/bridges/modules/messages/src/lib.rs
@@ -265,7 +265,7 @@ pub mod pallet {
 		) -> DispatchResult {
 			Self::ensure_owner_or_root(origin)?;
 			parameter.save();
-			Self::deposit_event(Event::ParameterUpdated(parameter));
+			Self::deposit_event(Event::ParameterUpdated { parameter });
 			Ok(())
 		}
 
@@ -623,7 +623,10 @@ pub mod pallet {
 
 				// emit 'delivered' event
 				let received_range = confirmed_messages.begin..=confirmed_messages.end;
-				Self::deposit_event(Event::MessagesDelivered(lane_id, confirmed_messages));
+				Self::deposit_event(Event::MessagesDelivered {
+					lane_id,
+					messages: confirmed_messages,
+				});
 
 				// if some new messages have been confirmed, reward relayers
 				let relayer_fund_account =
@@ -652,11 +655,11 @@ pub mod pallet {
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config<I>, I: 'static = ()> {
 		/// Pallet parameter has been updated.
-		ParameterUpdated(T::Parameter),
+		ParameterUpdated { parameter: T::Parameter },
 		/// Message has been accepted and is waiting to be delivered.
-		MessageAccepted(LaneId, MessageNonce),
+		MessageAccepted { lane_id: LaneId, nonce: MessageNonce },
 		/// Messages in the inclusive range have been delivered to the bridged chain.
-		MessagesDelivered(LaneId, DeliveredMessages),
+		MessagesDelivered { lane_id: LaneId, messages: DeliveredMessages },
 	}
 
 	#[pallet::error]
@@ -942,7 +945,7 @@ fn send_message<T: Config<I>, I: 'static>(
 		encoded_payload_len,
 	);
 
-	Pallet::<T, I>::deposit_event(Event::MessageAccepted(lane_id, nonce));
+	Pallet::<T, I>::deposit_event(Event::MessageAccepted { lane_id, nonce });
 
 	Ok(SendMessageArtifacts { nonce, weight: actual_weight })
 }
@@ -1188,7 +1191,10 @@ mod tests {
 			System::<TestRuntime>::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: TestEvent::Messages(Event::MessageAccepted(TEST_LANE_ID, message_nonce)),
+				event: TestEvent::Messages(Event::MessageAccepted {
+					lane_id: TEST_LANE_ID,
+					nonce: message_nonce
+				}),
 				topics: vec![],
 			}],
 		);
@@ -1232,10 +1238,10 @@ mod tests {
 			System::<TestRuntime>::events(),
 			vec![EventRecord {
 				phase: Phase::Initialization,
-				event: TestEvent::Messages(Event::MessagesDelivered(
-					TEST_LANE_ID,
-					DeliveredMessages::new(1, true),
-				)),
+				event: TestEvent::Messages(Event::MessagesDelivered {
+					lane_id: TEST_LANE_ID,
+					messages: DeliveredMessages::new(1, true),
+				}),
 				topics: vec![],
 			}],
 		);
@@ -1257,7 +1263,7 @@ mod tests {
 				System::<TestRuntime>::events(),
 				vec![EventRecord {
 					phase: Phase::Initialization,
-					event: TestEvent::Messages(Event::ParameterUpdated(parameter)),
+					event: TestEvent::Messages(Event::ParameterUpdated { parameter }),
 					topics: vec![],
 				}],
 			);
@@ -1281,7 +1287,7 @@ mod tests {
 				System::<TestRuntime>::events(),
 				vec![EventRecord {
 					phase: Phase::Initialization,
-					event: TestEvent::Messages(Event::ParameterUpdated(parameter)),
+					event: TestEvent::Messages(Event::ParameterUpdated { parameter }),
 					topics: vec![],
 				}],
 			);