f - remove tlv_record literal

Author: jkczyz

lightning/src/util/ser_macros.rs

@@ -26,10 +26,10 @@ macro_rules! encode_tlv {
 			field.write($stream)?;
 		}
 	};
-	($stream: expr, $type: expr, $field: expr, (tlv_record, ($fieldty:ty, $wrapper:ident))) => {
-		encode_tlv!($stream, $type, $field.map(|f| $wrapper(f)), option);
+	($stream: expr, $type: expr, $field: expr, (option, encoding: ($fieldty: ty, $encoding: ident))) => {
+		encode_tlv!($stream, $type, $field.map(|f| $encoding(f)), option);
 	};
-	($stream: expr, $type: expr, $field: expr, (tlv_record, $fieldty:ty)) => {
+	($stream: expr, $type: expr, $field: expr, (option, encoding: $fieldty: ty)) => {
 		encode_tlv!($stream, $type, $field, option);
 	};
 }
@@ -127,7 +127,7 @@ macro_rules! check_tlv_order {
 	($last_seen_type: expr, $typ: expr, $type: expr, $field: ident, (option: $trait: ident $(, $read_arg: expr)?)) => {{
 		// no-op
 	}};
-	($last_seen_type: expr, $typ: expr, $type: expr, $field: ident, (tlv_record, $fieldty:tt)) => {{
+	($last_seen_type: expr, $typ: expr, $type: expr, $field: ident, (option, encoding: $encoding: tt)) => {{
 		// no-op
 	}};
 }
@@ -159,7 +159,7 @@ macro_rules! check_missing_tlv {
 	($last_seen_type: expr, $type: expr, $field: ident, (option: $trait: ident $(, $read_arg: expr)?)) => {{
 		// no-op
 	}};
-	($last_seen_type: expr, $type: expr, $field: ident, (tlv_record, $fieldty:tt)) => {{
+	($last_seen_type: expr, $type: expr, $field: ident, (option, encoding: $encoding: tt)) => {{
 		// no-op
 	}};
 }
@@ -184,13 +184,13 @@ macro_rules! decode_tlv {
 	($reader: expr, $field: ident, (option: $trait: ident $(, $read_arg: expr)?)) => {{
 		$field = Some($trait::read(&mut $reader $(, $read_arg)*)?);
 	}};
-	($reader: expr, $field: ident, (tlv_record, ($fieldty:ty, $wrapper:ident))) => {{
+	($reader: expr, $field: ident, (option, encoding: ($fieldty: ty, $encoding: ident))) => {{
 		$field = {
-			let field: $wrapper<$fieldty> = ser::Readable::read(&mut $reader)?;
+			let field: $encoding<$fieldty> = ser::Readable::read(&mut $reader)?;
 			Some(field.into())
 		};
 	}};
-	($reader: expr, $field: ident, (tlv_record, $fieldty:ty)) => {{
+	($reader: expr, $field: ident, (option, encoding: $fieldty: ty)) => {{
 		decode_tlv!($reader, $field, option);
 	}};
 }
@@ -396,9 +396,6 @@ macro_rules! init_tlv_field_var {
 	($field: ident, option) => {
 		let mut $field = None;
 	};
-	($field: ident, tlv_record) => {
-		let mut $field = None;
-	};
 }
 
 /// Implements Readable/Writeable for a struct storing it as a set of TLVs
@@ -480,7 +477,7 @@ macro_rules! tlv_stream {
 		impl<'a> ::util::ser::Writeable for $nameref<'a> {
 			fn write<W: ::util::ser::Writer>(&self, writer: &mut W) -> Result<(), $crate::io::Error> {
 				encode_tlv_stream!(writer, {
-					$(($type, self.$field, (tlv_record, $fieldty))),*
+					$(($type, self.$field, (option, encoding: $fieldty))),*
 				});
 				Ok(())
 			}
@@ -489,10 +486,10 @@ macro_rules! tlv_stream {
 		impl ::util::ser::Readable for $name {
 			fn read<R: $crate::io::Read>(reader: &mut R) -> Result<Self, ::ln::msgs::DecodeError> {
 				$(
-					init_tlv_field_var!($field, tlv_record);
+					init_tlv_field_var!($field, option);
 				)*
 				decode_tlv_stream!(reader, {
-					$(($type, $field, (tlv_record, $fieldty))),*
+					$(($type, $field, (option, encoding: $fieldty))),*
 				});
 
 				Ok(Self {