WIP: Iterators in InvoiceTlvStreamRef

Author: jkczyz

lightning/src/offers/invoice.rs

@@ -30,7 +30,7 @@ use crate::offers::parse::{ParseError, ParsedMessage, SemanticError};
 use crate::offers::payer::{PayerTlvStream, PayerTlvStreamRef};
 use crate::offers::refund::{Refund, RefundContents};
 use crate::onion_message::BlindedPath;
-use crate::util::ser::{HighZeroBytesDroppedBigSize, SeekReadable, WithoutLength, Writeable, Writer};
+use crate::util::ser::{HighZeroBytesDroppedBigSize, Iterable, SeekReadable, WithoutLength, Writeable, Writer};
 
 use crate::prelude::*;
 
@@ -432,7 +432,7 @@ impl InvoiceFields {
 		};
 
 		InvoiceTlvStreamRef {
-			paths: Some(&self.paths),
+			paths: Some(Iterable(self.paths.iter())),
 			blindedpay: Some(&self.payinfo),
 			created_at: Some(self.created_at.as_secs()),
 			relative_expiry: self.relative_expiry.map(|duration| duration.as_secs() as u32),
@@ -461,7 +461,7 @@ impl TryFrom<Vec<u8>> for Invoice {
 }
 
 tlv_stream!(InvoiceTlvStream, InvoiceTlvStreamRef, 160..240, {
-	(160, paths: (Vec<BlindedPath>, WithoutLength)),
+	(160, paths: (Vec<BlindedPath>, Iterable<'a, core::slice::Iter<'a, BlindedPath>, BlindedPath>)),
 	(162, blindedpay: (Vec<BlindedPayInfo>, WithoutLength)),
 	(164, created_at: (u64, HighZeroBytesDroppedBigSize)),
 	(166, relative_expiry: (u32, HighZeroBytesDroppedBigSize)),

lightning/src/util/ser.rs

@@ -558,6 +558,18 @@ impl<'a, T: Writeable> Writeable for WithoutLength<&'a Vec<T>> {
 	}
 }
 
+pub(crate) struct Iterable<'a, I: Iterator<Item = &'a T> + Clone, T>(pub I);
+
+impl<'a, I: Iterator<Item = &'a T> + Clone, T: Writeable> Writeable for Iterable<'a, I, T> {
+	#[inline]
+	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
+		for ref v in self.0.clone() {
+			v.write(writer)?;
+		}
+		Ok(())
+	}
+}
+
 impl<T: MaybeReadable> Readable for WithoutLength<Vec<T>> {
 	#[inline]
 	fn read<R: Read>(mut reader: &mut R) -> Result<Self, DecodeError> {

lightning/src/util/ser_macros.rs

@@ -559,6 +559,7 @@ macro_rules! tlv_record_ref_type {
 	((u16, $wrapper: ident)) => { u16 };
 	((u32, $wrapper: ident)) => { u32 };
 	((u64, $wrapper: ident)) => { u64 };
+	(($type:ty, Iterable<$lifetime:lifetime, $itertype:ty, $valuetype:ty>)) => { Iterable<$lifetime, $itertype, $valuetype> };
 	(($type:ty, $wrapper:ident)) => { &'a $type };
 	($type:ty) => { &'a $type };
 }