fixup: Write structs to serialise-deserialise Channels inside peer-storage

Author: adi2011

lightning/src/ln/our_peer_storage.rs

@@ -15,11 +15,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::{Hash, HashEngine, Hmac, HmacEngine};
 use bitcoin::secp256k1::PublicKey;
 
-use crate::io;
-use crate::ln::msgs::DecodeError;
 use crate::ln::types::ChannelId;
 use crate::sign::PeerStorageKey;
-use crate::util::ser::{Readable, Writeable, Writer};
 
 use crate::crypto::chacha20poly1305rfc::ChaCha20Poly1305RFC;
 use crate::prelude::*;
@@ -172,30 +169,12 @@ pub(crate) struct PeerStorageMonitorHolder {
 	pub(crate) monitor_bytes: Vec<u8>,
 }
 
-impl Writeable for PeerStorageMonitorHolder {
-	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-		self.channel_id.write(w)?;
-		self.counterparty_node_id.write(w)?;
-		self.min_seen_secret.write(w)?;
-		self.monitor_bytes.write(w)
-	}
-}
-
-impl Readable for PeerStorageMonitorHolder {
-	fn read<R: io::Read>(r: &mut R) -> Result<Self, DecodeError> {
-		let channel_id = Readable::read(r)?;
-		let counterparty_node_id = Readable::read(r)?;
-		let min_seen_secret = Readable::read(r)?;
-		let monitor_bytes = Readable::read(r)?;
-
-		Ok(PeerStorageMonitorHolder {
-			channel_id,
-			counterparty_node_id,
-			min_seen_secret,
-			monitor_bytes,
-		})
-	}
-}
+impl_writeable_tlv_based!(PeerStorageMonitorHolder, {
+	(0, channel_id, required),
+	(1, counterparty_node_id, required),
+	(2, min_seen_secret, required),
+	(3, monitor_bytes, required_vec),
+});
 
 /// [`PeerStorageMonitorHolderList`] is used to serialise all the channels and send it over wire
 /// wrapped inside [`PeerStorage`].
@@ -207,7 +186,7 @@ pub(crate) struct PeerStorageMonitorHolderList {
 }
 
 impl_writeable_tlv_based!(PeerStorageMonitorHolderList, {
-	(1, monitors, required_vec),
+	(0, monitors, required_vec),
 });
 
 #[cfg(test)]