Skip to content

Commit c2dfc08

Browse files
committed
f: Move the message_received() call to apppropriate location
1. The message_received() should be triggered at the same point in any message handle flow. 2. Move the call to handle_message() to trigger message_received() before any kind of message processing takes place.
1 parent 77d62f3 commit c2dfc08

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lightning/src/ln/peer_handler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,6 +1625,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
16251625
let their_node_id = peer_lock.their_node_id.clone().expect("We know the peer's public key by the time we receive messages").0;
16261626
let logger = WithContext::from(&self.logger, Some(their_node_id), None, None);
16271627

1628+
self.message_handler.chan_handler.message_received();
1629+
16281630
let message = match self.do_handle_message_holding_peer_lock(peer_lock, message, &their_node_id, &logger)? {
16291631
Some(processed_message) => processed_message,
16301632
None => return Ok(None),
@@ -1752,8 +1754,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
17521754
log_trace!(logger, "Received message {:?} from {}", message, log_pubkey!(their_node_id));
17531755
}
17541756

1755-
self.message_handler.chan_handler.message_received();
1756-
17571757
let mut should_forward = None;
17581758

17591759
match message {

0 commit comments

Comments
 (0)