f - use LogicalMessage::CommitmentSignedBatch

Author: jkczyz

lightning/src/ln/peer_handler.rs

@@ -865,6 +865,7 @@ pub struct PeerManager<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: D
 
 enum LogicalMessage<T: core::fmt::Debug + wire::Type + wire::TestEq> {
 	FromWire(wire::Message<T>),
+	CommitmentSignedBatch(ChannelId, BTreeMap<Txid, msgs::CommitmentSigned>),
 }
 
 enum MessageHandlingError {
@@ -1662,6 +1663,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 			Some(LogicalMessage::FromWire(message)) => {
 				self.do_handle_message_without_peer_lock(peer_mutex, message, their_node_id, &logger)
 			},
+			Some(LogicalMessage::CommitmentSignedBatch(channel_id, batch)) => {
+				log_trace!(logger, "Received commitment_signed batch {:?} from {}", batch, log_pubkey!(their_node_id));
+				self.message_handler.chan_handler.handle_commitment_signed_batch(their_node_id, channel_id, batch);
+				return Ok(None);
+			},
 			None => Ok(None),
 		}
 	}
@@ -1790,17 +1796,16 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 					core::mem::swap(&mut batch, buffer);
 
 					peer_lock.commitment_signed_batch.take();
-					drop(peer_lock);
 
-					self.message_handler.chan_handler.handle_commitment_signed_batch(their_node_id, channel_id, batch);
+					return Ok(Some(LogicalMessage::CommitmentSignedBatch(channel_id, batch)));
 				}
 
 				return Ok(None);
 			} else if peer_lock.commitment_signed_batch.is_some() {
 				log_debug!(logger, "Peer {} sent non-batched commitment_signed for channel {} when expecting batched commitment_signed", log_pubkey!(their_node_id), &msg.channel_id);
 				return Err(PeerHandleError { }.into());
 			} else {
-				return Ok(Some(wire::Message::CommitmentSigned(msg)));
+				return Ok(Some(LogicalMessage::FromWire(wire::Message::CommitmentSigned(msg))));
 			}
 		} else if peer_lock.commitment_signed_batch.is_some() {
 			log_debug!(logger, "Peer {} sent non-commitment_signed message when expecting batched commitment_signed", log_pubkey!(their_node_id));