projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1922 from wpaulino/avoid-remaining-redundant-commitment-broadcasts
[rust-lightning]
/
lightning
/
src
/
util
/
ser_macros.rs
diff --git
a/lightning/src/util/ser_macros.rs
b/lightning/src/util/ser_macros.rs
index 3e1d8a9280d43da344076854739a5a81436f450b..91a52c538983a5dc1c65778488245545729c39ff 100644
(file)
--- 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)]
$(($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)?))
}),*
_ => {
Ok($st::$tuple_variant_name(Readable::read(reader)?))
}),*
_ => {
- Err(DecodeError::UnknownRequiredFeature)
+ Err(
$crate::ln::msgs::
DecodeError::UnknownRequiredFeature)
},
}
}
},
}
}