X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fser_macros.rs;h=afd7fcb2e0fc93b3f536a052c15cec841f8b43b0;hb=153b04833201d1de59104ed2671fafeb2b8ad509;hp=d137b0f677bcda557276701d8f7380eab9eb17cb;hpb=0acd5d3e46b307f5a34bc8ef5286bf1b5a58a37e;p=rust-lightning diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs index d137b0f6..afd7fcb2 100644 --- a/lightning/src/util/ser_macros.rs +++ b/lightning/src/util/ser_macros.rs @@ -39,6 +39,9 @@ macro_rules! _encode_tlv { field.write($stream)?; } }; + ($stream: expr, $type: expr, $field: expr, ignorable) => { + $crate::_encode_tlv!($stream, $type, $field, required); + }; ($stream: expr, $type: expr, $field: expr, (option, encoding: ($fieldty: ty, $encoding: ident))) => { $crate::_encode_tlv!($stream, $type, $field.map(|f| $encoding(f)), option); }; @@ -155,6 +158,9 @@ macro_rules! _get_varint_length_prefixed_tlv_length { $len.0 += field_len; } }; + ($len: expr, $type: expr, $field: expr, ignorable) => { + $crate::_get_varint_length_prefixed_tlv_length!($len, $type, $field, required); + }; } /// See the documentation of [`write_tlv_fields`]. @@ -501,13 +507,13 @@ macro_rules! impl_writeable { } /// Write out two bytes to indicate the version of an object. +/// /// $this_version represents a unique version of a type. Incremented whenever the type's -/// serialization format has changed or has a new interpretation. Used by a type's -/// reader to determine how to interpret fields or if it can understand a serialized -/// object. +/// serialization format has changed or has a new interpretation. Used by a type's reader to +/// determine how to interpret fields or if it can understand a serialized object. +/// /// $min_version_that_can_read_this is the minimum reader version which can understand this -/// serialized object. Previous versions will simply err with a -/// [`DecodeError::UnknownVersion`]. +/// serialized object. Previous versions will simply err with a [`DecodeError::UnknownVersion`]. /// /// Updates to either `$this_version` or `$min_version_that_can_read_this` should be included in /// release notes. @@ -567,6 +573,7 @@ macro_rules! read_tlv_fields { } /// Initializes the struct fields. +/// /// This is exported for use by other exported macros, do not use directly. #[doc(hidden)] #[macro_export] @@ -580,6 +587,9 @@ macro_rules! _init_tlv_based_struct_field { ($field: ident, option) => { $field }; + ($field: ident, ignorable) => { + if $field.is_none() { return Ok(None); } else { $field.unwrap() } + }; ($field: ident, required) => { $field.0.unwrap() }; @@ -589,6 +599,7 @@ macro_rules! _init_tlv_based_struct_field { } /// Initializes the variable we are going to read the TLV into. +/// /// This is exported for use by other exported macros, do not use directly. #[doc(hidden)] #[macro_export] @@ -608,9 +619,13 @@ macro_rules! _init_tlv_field_var { ($field: ident, option) => { let mut $field = None; }; + ($field: ident, ignorable) => { + let mut $field = None; + }; } /// Equivalent to running [`_init_tlv_field_var`] then [`read_tlv_fields`]. +/// /// This is exported for use by other exported macros, do not use directly. #[doc(hidden)] #[macro_export] @@ -795,30 +810,34 @@ macro_rules! _impl_writeable_tlv_based_enum_common { } } -/// Implement [`MaybeReadable`] and [`Writeable`] for an enum, with struct variants stored as TLVs and -/// tuple variants stored directly. -/// -/// This is largely identical to [`impl_writeable_tlv_based_enum`], except that odd variants will -/// return `Ok(None)` instead of `Err(`[`DecodeError::UnknownRequiredFeature`]`)`. It should generally be preferred -/// when [`MaybeReadable`] is practical instead of just [`Readable`] as it provides an upgrade path for -/// new variants to be added which are simply ignored by existing clients. +/// Implement [`Readable`] and [`Writeable`] for an enum, with struct variants stored as TLVs and tuple +/// variants stored directly. +/// The format is, for example +/// ```ignore +/// impl_writeable_tlv_based_enum!(EnumName, +/// (0, StructVariantA) => {(0, required_variant_field, required), (1, optional_variant_field, option)}, +/// (1, StructVariantB) => {(0, variant_field_a, required), (1, variant_field_b, required), (2, variant_vec_field, vec_type)}; +/// (2, TupleVariantA), (3, TupleVariantB), +/// ); +/// ``` +/// The type is written as a single byte, followed by any variant data. +/// Attempts to read an unknown type byte result in [`DecodeError::UnknownRequiredFeature`]. /// -/// [`MaybeReadable`]: crate::util::ser::MaybeReadable +/// [`Readable`]: crate::util::ser::Readable /// [`Writeable`]: crate::util::ser::Writeable /// [`DecodeError::UnknownRequiredFeature`]: crate::ln::msgs::DecodeError::UnknownRequiredFeature -/// [`Readable`]: crate::util::ser::Readable -macro_rules! impl_writeable_tlv_based_enum_upgradable { +#[macro_export] +macro_rules! impl_writeable_tlv_based_enum { ($st: ident, $(($variant_id: expr, $variant_name: ident) => {$(($type: expr, $field: ident, $fieldty: tt)),* $(,)*} - ),* $(,)* - $(; - $(($tuple_variant_id: expr, $tuple_variant_name: ident)),* $(,)*)*) => { + ),* $(,)*; + $(($tuple_variant_id: expr, $tuple_variant_name: ident)),* $(,)*) => { _impl_writeable_tlv_based_enum_common!($st, $(($variant_id, $variant_name) => {$(($type, $field, $fieldty)),*}),*; - $($(($tuple_variant_id, $tuple_variant_name)),*)*); + $(($tuple_variant_id, $tuple_variant_name)),*); - impl $crate::util::ser::MaybeReadable for $st { - fn read(reader: &mut R) -> Result, $crate::ln::msgs::DecodeError> { + impl $crate::util::ser::Readable for $st { + fn read(reader: &mut R) -> Result { let id: u8 = $crate::util::ser::Readable::read(reader)?; match id { $($variant_id => { @@ -828,51 +847,51 @@ macro_rules! impl_writeable_tlv_based_enum_upgradable { _init_and_read_tlv_fields!(reader, { $(($type, $field, $fieldty)),* }); - Ok(Some($st::$variant_name { + Ok($st::$variant_name { $( $field: _init_tlv_based_struct_field!($field, $fieldty) ),* - })) + }) }; f() }),* - $($($tuple_variant_id => { - Ok(Some($st::$tuple_variant_name(Readable::read(reader)?))) - }),*)* - _ if id % 2 == 1 => Ok(None), - _ => Err(DecodeError::UnknownRequiredFeature), + $($tuple_variant_id => { + Ok($st::$tuple_variant_name(Readable::read(reader)?)) + }),* + _ => { + Err($crate::ln::msgs::DecodeError::UnknownRequiredFeature) + }, } } } - } } -/// Implement [`Readable`] and [`Writeable`] for an enum, with struct variants stored as TLVs and tuple -/// variants stored directly. -/// The format is, for example -/// impl_writeable_tlv_based_enum!(EnumName, -/// (0, StructVariantA) => {(0, required_variant_field, required), (1, optional_variant_field, option)}, -/// (1, StructVariantB) => {(0, variant_field_a, required), (1, variant_field_b, required), (2, variant_vec_field, vec_type)}; -/// (2, TupleVariantA), (3, TupleVariantB), -/// ); -/// The type is written as a single byte, followed by any variant data. -/// Attempts to read an unknown type byte result in [`DecodeError::UnknownRequiredFeature`]. +/// Implement [`MaybeReadable`] and [`Writeable`] for an enum, with struct variants stored as TLVs and +/// tuple variants stored directly. /// -/// [`Readable`]: crate::util::ser::Readable +/// This is largely identical to [`impl_writeable_tlv_based_enum`], except that odd variants will +/// return `Ok(None)` instead of `Err(`[`DecodeError::UnknownRequiredFeature`]`)`. It should generally be preferred +/// when [`MaybeReadable`] is practical instead of just [`Readable`] as it provides an upgrade path for +/// new variants to be added which are simply ignored by existing clients. +/// +/// [`MaybeReadable`]: crate::util::ser::MaybeReadable /// [`Writeable`]: crate::util::ser::Writeable /// [`DecodeError::UnknownRequiredFeature`]: crate::ln::msgs::DecodeError::UnknownRequiredFeature -macro_rules! impl_writeable_tlv_based_enum { +/// [`Readable`]: crate::util::ser::Readable +#[macro_export] +macro_rules! impl_writeable_tlv_based_enum_upgradable { ($st: ident, $(($variant_id: expr, $variant_name: ident) => {$(($type: expr, $field: ident, $fieldty: tt)),* $(,)*} - ),* $(,)*; - $(($tuple_variant_id: expr, $tuple_variant_name: ident)),* $(,)*) => { + ),* $(,)* + $(; + $(($tuple_variant_id: expr, $tuple_variant_name: ident)),* $(,)*)*) => { _impl_writeable_tlv_based_enum_common!($st, $(($variant_id, $variant_name) => {$(($type, $field, $fieldty)),*}),*; - $(($tuple_variant_id, $tuple_variant_name)),*); + $($(($tuple_variant_id, $tuple_variant_name)),*)*); - impl $crate::util::ser::Readable for $st { - fn read(reader: &mut R) -> Result { + impl $crate::util::ser::MaybeReadable for $st { + fn read(reader: &mut R) -> Result, $crate::ln::msgs::DecodeError> { let id: u8 = $crate::util::ser::Readable::read(reader)?; match id { $($variant_id => { @@ -882,20 +901,19 @@ macro_rules! impl_writeable_tlv_based_enum { _init_and_read_tlv_fields!(reader, { $(($type, $field, $fieldty)),* }); - Ok($st::$variant_name { + Ok(Some($st::$variant_name { $( $field: _init_tlv_based_struct_field!($field, $fieldty) ),* - }) + })) }; f() }),* - $($tuple_variant_id => { - Ok($st::$tuple_variant_name(Readable::read(reader)?)) - }),* - _ => { - Err($crate::ln::msgs::DecodeError::UnknownRequiredFeature) - }, + $($($tuple_variant_id => { + Ok(Some($st::$tuple_variant_name(Readable::read(reader)?))) + }),*)* + _ if id % 2 == 1 => Ok(None), + _ => Err(DecodeError::UnknownRequiredFeature), } } }