Skip to content

Commit

Permalink
Don't require import of internal macros
Browse files Browse the repository at this point in the history
Commit f560320 introduced changes that require users of
`impl_writeable_tlv_based`/`impl_writeable_tlv_based_enum` to import
`_encode_varint_length_prefixed_tlv` and `alloc` separately.

Here, we take care of the necessary imports in
`_encode_varint_length_prefixed_tlv` itself, allowing users to just
import the `impl_writeable_tlv_based` variant they need.
  • Loading branch information
tnull committed Aug 17, 2023
1 parent f609fcf commit 7e270cb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lightning/src/util/ser_macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,10 @@ macro_rules! _get_varint_length_prefixed_tlv_length {
#[macro_export]
macro_rules! _encode_varint_length_prefixed_tlv {
($stream: expr, {$(($type: expr, $field: expr, $fieldty: tt)),*}) => { {
_encode_varint_length_prefixed_tlv!($stream, {$(($type, $field, $fieldty)),*}, &[])
$crate::_encode_varint_length_prefixed_tlv!($stream, {$(($type, $field, $fieldty)),*}, &[])
} };
($stream: expr, {$(($type: expr, $field: expr, $fieldty: tt)),*}, $extra_tlvs: expr) => { {
extern crate alloc;
use $crate::util::ser::BigSize;
use alloc::vec::Vec;
let len = {
Expand Down Expand Up @@ -814,8 +815,7 @@ macro_rules! _init_and_read_tlv_fields {
///
/// For example,
/// ```
/// # use lightning::{impl_writeable_tlv_based, _encode_varint_length_prefixed_tlv};
/// # extern crate alloc;
/// # use lightning::impl_writeable_tlv_based;
/// struct LightningMessage {
/// tlv_integer: u32,
/// tlv_default_integer: u32,
Expand Down

0 comments on commit 7e270cb

Please sign in to comment.