f - take instead of swap

Author: jkczyz

lightning/src/ln/peer_handler.rs

@@ -1791,16 +1791,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 				}
 
 				if buffer.len() >= batch_size {
-					let channel_id = *channel_id;
-					let mut batch = BTreeMap::new();
-					core::mem::swap(&mut batch, buffer);
-
-					peer_lock.commitment_signed_batch.take();
-
+					let (channel_id, batch) = peer_lock.commitment_signed_batch.take().expect("batch should have been inserted");
 					return Ok(Some(LogicalMessage::CommitmentSignedBatch(channel_id, batch)));
+				} else {
+					return Ok(None);
 				}
-
-				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());