From e20163c4ea7597834405aab738a535171b4ff9f3 Mon Sep 17 00:00:00 2001 From: bear <2630582710@qq.com> Date: Mon, 6 Sep 2021 14:05:10 +0800 Subject: [PATCH] Rename param and update comment (#1108) * Rename param in `confirm_delivery` * Fix typo * Update comment * Fix review issue --- bridges/modules/messages/src/inbound_lane.rs | 4 +--- bridges/modules/messages/src/lib.rs | 2 +- bridges/modules/messages/src/outbound_lane.rs | 16 ++++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/bridges/modules/messages/src/inbound_lane.rs b/bridges/modules/messages/src/inbound_lane.rs index ae5de1c152..69eabc6ebd 100644 --- a/bridges/modules/messages/src/inbound_lane.rs +++ b/bridges/modules/messages/src/inbound_lane.rs @@ -136,9 +136,7 @@ impl InboundLane { return ReceivalResult::TooManyUnconfirmedMessages; } - // dispatch message before updating anything in the storage. If dispatch would panic, - // (which should not happen in the runtime) then we simply won't consider message as - // delivered (no changes to the inbound lane storage have been made). + // then, dispatch message let dispatch_result = P::dispatch( relayer_at_this_chain, DispatchMessage { diff --git a/bridges/modules/messages/src/lib.rs b/bridges/modules/messages/src/lib.rs index 7c6bacfb66..2db0de19d1 100644 --- a/bridges/modules/messages/src/lib.rs +++ b/bridges/modules/messages/src/lib.rs @@ -352,7 +352,7 @@ pub mod pallet { // if someone tries to pay for already-delivered message, we're rejecting this intention // (otherwise this additional fee will be locked forever in relayers fund) // - // if someone tries to pay for not-yet-sent message, we're rejeting this intention, or + // if someone tries to pay for not-yet-sent message, we're rejecting this intention, or // we're risking to have mess in the storage let lane = outbound_lane::(lane_id); ensure!( diff --git a/bridges/modules/messages/src/outbound_lane.rs b/bridges/modules/messages/src/outbound_lane.rs index 5888fa7fd7..1962e0282a 100644 --- a/bridges/modules/messages/src/outbound_lane.rs +++ b/bridges/modules/messages/src/outbound_lane.rs @@ -101,40 +101,40 @@ impl OutboundLane { pub fn confirm_delivery( &mut self, max_allowed_messages: MessageNonce, - latest_received_nonce: MessageNonce, + latest_delivered_nonce: MessageNonce, relayers: &VecDeque>, ) -> ReceivalConfirmationResult { let mut data = self.storage.data(); - if latest_received_nonce <= data.latest_received_nonce { + if latest_delivered_nonce <= data.latest_received_nonce { return ReceivalConfirmationResult::NoNewConfirmations; } - if latest_received_nonce > data.latest_generated_nonce { + if latest_delivered_nonce > data.latest_generated_nonce { return ReceivalConfirmationResult::FailedToConfirmFutureMessages; } - if latest_received_nonce - data.latest_received_nonce > max_allowed_messages { + if latest_delivered_nonce - data.latest_received_nonce > max_allowed_messages { // that the relayer has declared correct number of messages that the proof contains (it is // checked outside of the function). But it may happen (but only if this/bridged chain storage is // corrupted, though) that the actual number of confirmed messages if larger than declared. // This would mean that 'reward loop' will take more time than the weight formula accounts, // so we can't allow that. return ReceivalConfirmationResult::TryingToConfirmMoreMessagesThanExpected( - latest_received_nonce - data.latest_received_nonce, + latest_delivered_nonce - data.latest_received_nonce, ); } let dispatch_results = - match extract_dispatch_results(data.latest_received_nonce, latest_received_nonce, relayers) { + match extract_dispatch_results(data.latest_received_nonce, latest_delivered_nonce, relayers) { Ok(dispatch_results) => dispatch_results, Err(extract_error) => return extract_error, }; let prev_latest_received_nonce = data.latest_received_nonce; - data.latest_received_nonce = latest_received_nonce; + data.latest_received_nonce = latest_delivered_nonce; self.storage.set_data(data); ReceivalConfirmationResult::ConfirmedMessages(DeliveredMessages { begin: prev_latest_received_nonce + 1, - end: latest_received_nonce, + end: latest_delivered_nonce, dispatch_results, }) }