Skip to content

Commit 2df93ca

Browse files
committed
fix some unit tests
1 parent 6bae489 commit 2df93ca

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

lightning/src/ln/peer_handler.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,13 +474,15 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
474474
let pause_read = match peers.peers.get_mut(peer_descriptor) {
475475
None => panic!("Descriptor for read_event is not already known to PeerManager"),
476476
Some(peer) => {
477+
let mut read_from_conduit_buffer = false;
477478
peer.pending_read_buffer.extend_from_slice(&data);
478-
while peer.pending_read_buffer.len() > 0 {
479+
while peer.pending_read_buffer.len() > 0 || read_from_conduit_buffer {
479480

480481
let mut conduit_option = None;
481482
let mut remote_pubkey_option = None;
482483

483484
let mut needs_to_send_init_message = false;
485+
read_from_conduit_buffer = false;
484486

485487
if let &mut PeerState::Authenticating(ref mut handshake) = &mut peer.encryptor {
486488
let (next_act, conduit) = handshake.process_act(&peer.pending_read_buffer).unwrap();
@@ -577,6 +579,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
577579
let message_option = conduit.decrypt_single_message(Some(&peer.pending_read_buffer.clone()));
578580
peer.pending_read_buffer = Vec::new(); // empty the pending read buffer
579581
let msg_data = if let Some(message) = message_option {
582+
read_from_conduit_buffer = true;
580583
message
581584
} else {
582585
break;

0 commit comments

Comments
 (0)