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, Balance, ChannelMonitor, ChannelMonitorUpdate, MonitorEvent, TransactionOutputs,
+	write_util_internal, Balance, ChannelMonitor, ChannelMonitorUpdate, MonitorEvent, TransactionOutputs,
 	WithChannelMonitor,
 };
 use crate::chain::transaction::{OutPoint, TransactionData};
@@ -835,7 +835,7 @@ where
 			let counterparty_node_id = mon.monitor.get_counterparty_node_id();
 			let chan_mon = mon.monitor.inner.lock().unwrap();
 
-			match write_util(&chan_mon, true, &mut ser_chan) {
+			match write_util_internal(&chan_mon, true, &mut ser_chan) {
 				Ok(_) => {
 					// Adding size of peer_storage_monitor.
 					curr_size += ser_chan.0.serialized_length()

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<Signer: EcdsaChannelSigner, W: Writer>(
+pub(crate) fn write_util_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<Signer: EcdsaChannelSigner, W: Writer>(
 
 impl<Signer: EcdsaChannelSigner> Writeable for ChannelMonitorImpl<Signer> {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
-		write_util(self, false, writer)
+		write_util_internal(self, false, writer)
 	}
 }