impl Readable/Writable to Vec<ChannelDetails>

Author: joemphilips

bindings/src/channelmanager.rs

@@ -33,8 +33,9 @@ use crate::{
             FFISecret,
             FFIOutPoint
         },
-        *,
-    }
+        *
+    },
+    utils::into_fixed_buffer,
 };
 use lightning::ln::channelmanager::{PaymentSecret, PaymentPreimage};
 
@@ -171,6 +172,13 @@ ffi! {
         FFIResult::ok()
     }
 
+    fn list_channels(buf_out: Out<u8>, buf_len: usize, actual_channels_len: Out<usize>, handle: FFIArcChannelManagerHandle) -> FFIResult {
+        let buf = unsafe_block!("The buffer lives as long as this function, the length is within the buffer and the buffer won't be read before initialization" => buf_out.as_uninit_bytes_mut(buf_len));
+        let chan_man: &FFIArcChannelManager = unsafe_block!("We know handle points to valid channel_manager" => handle.as_ref());
+        let mut channels = chan_man.list_channels();
+        into_fixed_buffer(&mut channels, buf, &mut actual_channels_len)
+    }
+
     fn create_channel(their_network_key: PublicKey, channel_value_satoshis: u64, push_msat: u64, user_id: u64, handle: FFIArcChannelManagerHandle) -> FFIResult {
         create_channel_inner(their_network_key, channel_value_satoshis, push_msat, user_id, None, handle)
     }

lightning/src/ln/channelmanager.rs

@@ -500,6 +500,16 @@ impl Writeable for ChannelDetails {
 	}
 }
 
+impl Writeable for Vec<ChannelDetails> {
+	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), Error> {
+		(self.len() as u16).write(writer)?;
+		for i in self.iter() {
+			i.write(writer)?;
+		}
+		Ok(())
+	}
+}
+
 impl Readable for ChannelDetails {
 	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
         let channel_id: [u8; 32] = Readable::read(reader)?;
@@ -518,6 +528,18 @@ impl Readable for ChannelDetails {
 	}
 }
 
+impl Readable for Vec<ChannelDetails> {
+	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
+		let len: u16 = Readable::read(r)?;
+		let mut ret = Vec::with_capacity(len as usize);
+		for i in 0..(len as usize) {
+			let d: ChannelDetails = Readable::read(r)?;
+			ret[i] = d;
+		}
+		Ok(ret)
+	}
+}
+
 /// If a payment fails to send, it can be in one of several states. This enum is returned as the
 /// Err() type describing which state the payment is in, see the description of individual enum
 /// states for more.