X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fser_macros.rs;h=373a64e3e0e935d8a63b499041ac1f47064fbc76;hb=8ecd7c30c903b9e2db0c280110200f7c61565c11;hp=afd7fcb2e0fc93b3f536a052c15cec841f8b43b0;hpb=153b04833201d1de59104ed2671fafeb2b8ad509;p=rust-lightning

diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
index afd7fcb2..373a64e3 100644
--- a/lightning/src/util/ser_macros.rs
+++ b/lightning/src/util/ser_macros.rs
@@ -286,6 +286,9 @@ 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, (option, encoding: ($fieldty: ty, $encoding: ident, $encoder:ty))) => {{
+		$crate::_decode_tlv!($reader, $field, (option, encoding: ($fieldty, $encoding)));
+	}};
 	($reader: expr, $field: ident, (option, encoding: ($fieldty: ty, $encoding: ident))) => {{
 		$field = {
 			let field: $encoding<$fieldty> = ser::Readable::read(&mut $reader)?;
@@ -730,7 +733,8 @@ macro_rules! tlv_stream {
 			)*
 		}
 
-		#[derive(Debug, PartialEq)]
+		#[cfg_attr(test, derive(PartialEq))]
+		#[derive(Debug)]
 		pub(super) struct $nameref<'a> {
 			$(
 				pub(super) $field: Option<tlv_record_ref_type!($fieldty)>,
@@ -770,6 +774,7 @@ macro_rules! tlv_stream {
 
 macro_rules! tlv_record_type {
 	(($type:ty, $wrapper:ident)) => { $type };
+	(($type:ty, $wrapper:ident, $encoder:ty)) => { $type };
 	($type:ty) => { $type };
 }
 
@@ -780,6 +785,7 @@ macro_rules! tlv_record_ref_type {
 	((u32, $wrapper: ident)) => { u32 };
 	((u64, $wrapper: ident)) => { u64 };
 	(($type:ty, $wrapper:ident)) => { &'a $type };
+	(($type:ty, $wrapper:ident, $encoder:ty)) => { $encoder };
 	($type:ty) => { &'a $type };
 }