fixup: Serialise ChannelMonitors and send them over inside Peer Storage

Author: adi2011

lightning/src/chain/chainmonitor.rs

@@ -29,7 +29,7 @@ use bitcoin::hash_types::{BlockHash, Txid};
 use crate::chain;
 use crate::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
 use crate::chain::channelmonitor::{
-	write_util_internal, Balance, ChannelMonitor, ChannelMonitorUpdate, MonitorEvent, TransactionOutputs,
+	write_chanmon_internal, Balance, ChannelMonitor, ChannelMonitorUpdate, MonitorEvent, TransactionOutputs,
 	WithChannelMonitor,
 };
 use crate::chain::transaction::{OutPoint, TransactionData};
@@ -814,8 +814,9 @@ where
 
 	fn send_peer_storage(&self, their_node_id: PublicKey) {
 		const MAX_PEER_STORAGE_SIZE: usize = 65531;
+		const USIZE_LEN: usize = core::mem::size_of::<usize>();
 		let random_bytes = self.entropy_source.get_secure_random_bytes();
-		let random_usize = usize::from_le_bytes(random_bytes[0..core::mem::size_of::<usize>()].try_into().unwrap());
+		let random_usize = usize::from_le_bytes(random_bytes[0..USIZE_LEN].try_into().unwrap());
 
 		let monitors = self.monitors.read().unwrap();
 		let mut monitors_list = PeerStorageMonitorHolderList { monitors: Vec::new() };
@@ -835,31 +836,22 @@ where
 			let counterparty_node_id = mon.monitor.get_counterparty_node_id();
 			let chan_mon = mon.monitor.inner.lock().unwrap();
 
-			match write_util_internal(&chan_mon, true, &mut ser_chan) {
-				Ok(_) => {
-					// Adding size of peer_storage_monitor.
-					curr_size += ser_chan.0.serialized_length()
-						+ min_seen_secret.serialized_length()
-						+ chan_id.serialized_length()
-						+ counterparty_node_id.serialized_length();
+			write_chanmon_internal(&chan_mon, true, &mut ser_chan).expect("can not write Channel Monitor for peer storage message");
 
-					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,
+			};
 
-					let peer_storage_monitor = PeerStorageMonitorHolder {
-						channel_id: *chan_id,
-						min_seen_secret,
-						counterparty_node_id,
-						monitor_bytes: ser_chan.0,
-					};
+			// Adding size of peer_storage_monitor.
+			curr_size += peer_storage_monitor.serialized_length();
 
-					monitors_list.monitors.push(peer_storage_monitor);
-				},
-				Err(_) => {
-					panic!("Can not write monitor for {}", mon.monitor.channel_id())
-				},
+			if curr_size > MAX_PEER_STORAGE_SIZE {
+				break;
 			}
+			monitors_list.monitors.push(peer_storage_monitor);
 		}
 
 		let serialised_channels = monitors_list.encode();

lightning/src/chain/channelmonitor.rs

@@ -1350,7 +1350,7 @@ const MIN_SERIALIZATION_VERSION: u8 = 1;
 /// NOTE: `is_stub` is true only when we are using this to serialise for Peer Storage.
 ///
 /// [`ChainMonitor`]: crate::chain::chainmonitor::ChainMonitor
-pub(crate) fn write_util_internal<Signer: EcdsaChannelSigner, W: Writer>(
+pub(crate) fn write_chanmon_internal<Signer: EcdsaChannelSigner, W: Writer>(
 	channel_monitor: &ChannelMonitorImpl<Signer>, is_stub: bool, writer: &mut W,
 ) -> Result<(), Error> {
 	write_ver_prefix!(writer, SERIALIZATION_VERSION, MIN_SERIALIZATION_VERSION);
@@ -1592,7 +1592,7 @@ pub(crate) fn write_util_internal<Signer: EcdsaChannelSigner, W: Writer>(
 
 impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
-		write_util_internal(self, false, writer)
+		write_chanmon_internal(self, false, writer)
 	}
 }