fixup: Handle PeerStorageRetrieval in ChannelManager

Author: adi2011

lightning/src/ln/channelmanager.rs

@@ -8346,19 +8346,24 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		// TODO: Check if have any stale or missing ChannelMonitor.
 		let logger = WithContext::from(&self.logger, Some(counterparty_node_id), None, None);
 
-		if msg.data.len() < 16 {
+		// `MIN_CYPHERTEXT_LEN` is 16 bytes because the mandatory authentication tag length is 16 bytes.
+		const MIN_CYPHERTEXT_LEN: usize = 16;
+
+		if msg.data.len() < MIN_CYPHERTEXT_LEN {
 			log_debug!(logger, "Invalid YourPeerStorage received from {}", log_pubkey!(counterparty_node_id));
 			return Err(MsgHandleErrInternal::from_chan_no_close(ChannelError::Warn(
 				"Invalid peer_storage_retrieval message received.".into(),
 			), ChannelId([0; 32])));
 		}
 
- 		let mut res = vec![0; msg.data.len() - 16];
 		let our_peerstorage_encryption_key = self.node_signer.get_peer_storage_key();
 
-		match OurPeerStorage::decrypt_our_peer_storage(&mut res, &msg.data.clone(), our_peerstorage_encryption_key) {
-			Ok(()) => {
-				// Decryption successful, the plaintext is now stored in `res`.
+		match OurPeerStorage::decrypt_our_peer_storage(&msg.data, our_peerstorage_encryption_key) {
+			Ok(our_peer_storage) => {
+				// Decryption successful.
+				if our_peer_storage.get_ser_channels().len() == 0 {
+					log_trace!(logger, "Received a peer storage from peer {} with 0 channels.", log_pubkey!(counterparty_node_id));
+				}
 			}
 			Err(_) => {
 				log_debug!(logger, "Invalid YourPeerStorage received from {}", log_pubkey!(counterparty_node_id));
@@ -8368,11 +8373,6 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				), ChannelId([0; 32])));
 			}
 		}
-		let our_peer_storage = <OurPeerStorage as Readable>::read(&mut ::bitcoin::io::Cursor::new(res)).unwrap();
-
-		if our_peer_storage.get_ser_channels().len() == 0 {
-			log_debug!(logger, "Received a peer storage from peer {} with 0 channels.", log_pubkey!(counterparty_node_id));
-		}
 
 		Ok(())
 	}