From: Matt Corallo <git@bluematt.me>
Date: Mon, 5 Jul 2021 23:18:41 +0000 (+0000)
Subject: Improve TLV serialization macro callability very slightly
X-Git-Tag: v0.0.100~1^2~10
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=769eea8a8d706db198d7fb338f159f79ca9db652;p=rust-lightning

Improve TLV serialization macro callability very slightly

This allows decode_tlv_stream!() to be called with either a mutable
reference to a stream or a stream itself and allows
encode_tlv_stream!() to be called with an excess , at the end of
the parameter list.
---

diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
index 960fae45d..0ad9710a7 100644
--- a/lightning/src/util/ser_macros.rs
+++ b/lightning/src/util/ser_macros.rs
@@ -159,6 +159,7 @@ macro_rules! decode_tlv_stream {
 	($stream: expr, {$(($type: expr, $field: ident, $fieldty: tt)),* $(,)*}) => { {
 		use ln::msgs::DecodeError;
 		let mut last_seen_type: Option<u64> = None;
+		let mut stream_ref = $stream;
 		'tlv_read: loop {
 			use util::ser;
 
@@ -168,7 +169,7 @@ macro_rules! decode_tlv_stream {
 				// determine whether we should break or return ShortRead if we get an
 				// UnexpectedEof. This should in every case be largely cosmetic, but its nice to
 				// pass the TLV test vectors exactly, which requre this distinction.
-				let mut tracking_reader = ser::ReadTrackingReader::new($stream);
+				let mut tracking_reader = ser::ReadTrackingReader::new(&mut stream_ref);
 				match ser::Readable::read(&mut tracking_reader) {
 					Err(DecodeError::ShortRead) => {
 						if !tracking_reader.have_read {
@@ -196,8 +197,8 @@ macro_rules! decode_tlv_stream {
 			last_seen_type = Some(typ.0);
 
 			// Finally, read the length and value itself:
-			let length: ser::BigSize = ser::Readable::read($stream)?;
-			let mut s = ser::FixedLengthReader::new($stream, length.0);
+			let length: ser::BigSize = ser::Readable::read(&mut stream_ref)?;
+			let mut s = ser::FixedLengthReader::new(&mut stream_ref, length.0);
 			match typ.0 {
 				$($type => {
 					decode_tlv!(s, $field, $fieldty);