f - remove extra serialization in OnionHopData

Author: alecchendev

lightning/src/ln/msgs.rs

@@ -1944,19 +1944,13 @@ impl Writeable for OnionHopData {
 					custom_tlvs.push((5482373484, preimage_bytes));
 				}
 				custom_tlvs.sort_by_key(|(typ, _)| *typ);
-				let mut custom_tlv_stream = Vec::new();
-				for (typ, value) in custom_tlvs {
-					BigSize(typ).write(&mut custom_tlv_stream)?;
-					BigSize(value.len() as u64).write(&mut custom_tlv_stream)?;
-					custom_tlv_stream.write_all(&value)?;
-				}
 
 				_encode_varint_length_prefixed_tlv!(w, {
 					(2, HighZeroBytesDroppedBigSize(self.amt_to_forward), required),
 					(4, HighZeroBytesDroppedBigSize(self.outgoing_cltv_value), required),
 					(8, payment_data, option),
 					(16, payment_metadata.as_ref().map(|m| WithoutLength(m)), option)
-				}, &custom_tlv_stream);
+				}, &custom_tlvs);
 			},
 		}
 		Ok(())
@@ -2443,7 +2437,7 @@ mod tests {
 	use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures};
 	use crate::ln::msgs::{self, FinalOnionHopData, OnionErrorPacket, OnionHopDataFormat};
 	use crate::routing::gossip::{NodeAlias, NodeId};
-	use crate::util::ser::{Writeable, Writer, Readable, Hostname, TransactionU16LenLimited};
+	use crate::util::ser::{Writeable, Readable, Hostname, TransactionU16LenLimited};
 
 	use bitcoin::hashes::hex::FromHex;
 	use bitcoin::util::address::Address;

lightning/src/util/ser_macros.rs

@@ -191,23 +191,35 @@ macro_rules! _get_varint_length_prefixed_tlv_length {
 #[doc(hidden)]
 #[macro_export]
 macro_rules! _encode_varint_length_prefixed_tlv {
-	($stream: expr, {$(($type: expr, $field: expr, $fieldty: tt)),*}) => {
-		_encode_varint_length_prefixed_tlv!($stream, {$(($type, $field, $fieldty)),*}, &[0u8; 0])
-	};
-	($stream: expr, {$(($type: expr, $field: expr, $fieldty: tt)),*}, $extra: expr) => { {
-		// $extra should be a byte slice holding a valid TLV stream
+	($stream: expr, {$(($type: expr, $field: expr, $fieldty: tt)),*}) => { {
+		use alloc::vec::Vec;
+		_encode_varint_length_prefixed_tlv!($stream, {$(($type, $field, $fieldty)),*}, Vec::<(u64, Vec<u8>)>::new())
+	} };
+	($stream: expr, {$(($type: expr, $field: expr, $fieldty: tt)),*}, $extra_tlvs: expr) => { {
 		use $crate::util::ser::BigSize;
 		let len = {
 			#[allow(unused_mut)]
 			let mut len = $crate::util::ser::LengthCalculatingWriter(0);
 			$(
 				$crate::_get_varint_length_prefixed_tlv_length!(len, $type, $field, $fieldty);
 			)*
-			len.0 + $extra.len()
+			for (typ, value) in $extra_tlvs.iter() {
+				$crate::_get_varint_length_prefixed_tlv_length!(len, *typ, *value, vec_type);
+			}
+			len.0
 		};
 		BigSize(len as u64).write($stream)?;
 		$crate::encode_tlv_stream!($stream, { $(($type, $field, $fieldty)),* });
-		$stream.write_all($extra)?;
+		for (typ, value) in $extra_tlvs.iter() {
+			$crate::_encode_tlv!($stream, *typ, *value, vec_type);
+		}
+
+		#[cfg(debug_assertions)] {
+			let mut last_seen: Option<u64> = None;
+			for (typ, _) in $extra_tlvs.iter() {
+				$crate::_check_encoded_tlv_order!(last_seen, *typ, vec_type);
+			}
+		}
 	} };
 }
 
@@ -772,6 +784,7 @@ macro_rules! _init_and_read_tlv_fields {
 /// For example,
 /// ```
 /// # use lightning::{impl_writeable_tlv_based, _encode_varint_length_prefixed_tlv};
+/// # extern crate alloc;
 /// struct LightningMessage {
 /// 	tlv_integer: u32,
 /// 	tlv_default_integer: u32,
@@ -1052,7 +1065,7 @@ mod tests {
 	use crate::io::{self, Cursor};
 	use crate::prelude::*;
 	use crate::ln::msgs::DecodeError;
-	use crate::util::ser::{Writer, Writeable, HighZeroBytesDroppedBigSize, VecWriter};
+	use crate::util::ser::{Writeable, HighZeroBytesDroppedBigSize, VecWriter};
 	use bitcoin::secp256k1::PublicKey;
 
 	// The BOLT TLV test cases don't include any tests which use our "required-value" logic since