X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fser_macros.rs;h=91a52c538983a5dc1c65778488245545729c39ff;hb=e38ab09c3a9514768a9833b2636b2b969f62b3e1;hp=3e1d8a9280d43da344076854739a5a81436f450b;hpb=8245128c0569cb6e6b0c61a203b26ea1c023ffaf;p=rust-lightning

diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
index 3e1d8a92..91a52c53 100644
--- a/lightning/src/util/ser_macros.rs
+++ b/lightning/src/util/ser_macros.rs
@@ -504,15 +504,16 @@ macro_rules! tlv_stream {
 		$(($type:expr, $field:ident : $fieldty:tt)),* $(,)*
 	}) => {
 		#[derive(Debug)]
-		pub(crate) struct $name {
+		pub(super) struct $name {
 			$(
-				$field: Option<tlv_record_type!($fieldty)>,
+				pub(super) $field: Option<tlv_record_type!($fieldty)>,
 			)*
 		}
 
-		pub(crate) struct $nameref<'a> {
+		#[derive(Debug, PartialEq)]
+		pub(super) struct $nameref<'a> {
 			$(
-				pub(crate) $field: Option<tlv_record_ref_type!($fieldty)>,
+				pub(super) $field: Option<tlv_record_ref_type!($fieldty)>,
 			)*
 		}
 
@@ -679,7 +680,7 @@ macro_rules! impl_writeable_tlv_based_enum {
 						Ok($st::$tuple_variant_name(Readable::read(reader)?))
 					}),*
 					_ => {
-						Err(DecodeError::UnknownRequiredFeature)
+						Err($crate::ln::msgs::DecodeError::UnknownRequiredFeature)
 					},
 				}
 			}