fixup: Serialise ChannelMonitors and send them over inside Peer

Author: adi2011

lightning/src/chain/chainmonitor.rs

@@ -813,9 +813,9 @@ where
 	}
 
 	fn send_peer_storage(&self, their_node_id: PublicKey) {
-		static MAX_PEER_STORAGE_SIZE: usize = 65000;
+		const MAX_PEER_STORAGE_SIZE: usize = 65531;
 		let random_bytes = self.entropy_source.get_secure_random_bytes();
-		let random_usize = usize::from_le_bytes(random_bytes[0..8].try_into().unwrap());
+		let random_usize = usize::from_le_bytes(random_bytes[0..core::mem::size_of::<usize>()].try_into().unwrap());
 
 		let monitors = self.monitors.read().unwrap();
 		let mut monitors_list = PeerStorageMonitorHolderList { monitors: Vec::new() };
@@ -833,22 +833,22 @@ where
 			let mut ser_chan = VecWriter(Vec::new());
 			let min_seen_secret = mon.monitor.get_min_seen_secret();
 			let counterparty_node_id = mon.monitor.get_counterparty_node_id();
+			let chan_mon = mon.monitor.inner.lock().unwrap();
 
-			match write_util(&mon.monitor.inner.lock().unwrap(), true, &mut ser_chan) {
+			match write_util(&chan_mon, true, &mut ser_chan) {
 				Ok(_) => {
-					let mut ser_channel = Vec::new();
+					// Adding size of peer_storage_monitor.
+					curr_size += ser_chan.0.len() + 32 + 8 + 32 + 14;
+					if curr_size > MAX_PEER_STORAGE_SIZE {
+						break;
+					}
+
 					let peer_storage_monitor = PeerStorageMonitorHolder {
 						channel_id: *chan_id,
 						min_seen_secret,
 						counterparty_node_id,
 						monitor_bytes: ser_chan.0,
 					};
-					peer_storage_monitor.write(&mut ser_channel).unwrap();
-
-					curr_size += ser_channel.len();
-					if curr_size > MAX_PEER_STORAGE_SIZE {
-						break;
-					}
 
 					monitors_list.monitors.push(peer_storage_monitor);
 				},