mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't initialise Vecs being read with VecReadWrapper explicitly

Browse source 
This simplifies the tlv serialization read macro somewhat by
allowing callsites to simply read into an `Option<Vec>` instead of
needing to read into an `Option<VecReadWrapper>` when using
`vec_type`.
This commit is contained in:
Matt Corallo 2021-08-01 02:34:08 +00:00
parent 2ced708b71
commit efa579bc61
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lightning/src/util/ser_macros.rs
View file

@ -154,7 +154,8 @@ macro_rules! decode_tlv {
$field = ser::Readable::read(&mut $reader)?;
}};
($reader: expr, $field: ident, vec_type) => {{
$field = Some(ser::Readable::read(&mut $reader)?);
let f: ::util::ser::VecReadWrapper<_> = ser::Readable::read(&mut $reader)?;
$field = Some(f.0);
}};
($reader: expr, $field: ident, option) => {{
$field = Some(ser::Readable::read(&mut $reader)?);
@ -399,7 +400,7 @@ macro_rules! init_tlv_based_struct_field {
$field.0.unwrap()
};
($field: ident, vec_type) => {
$field.unwrap().0
$field.unwrap()
};
}
@ -411,7 +412,7 @@ macro_rules! init_tlv_field_var {
let mut $field = ::util::ser::OptionDeserWrapper(None);
};
($field: ident, vec_type) => {
let mut $field = Some(::util::ser::VecReadWrapper(Vec::new()));
let mut $field = Some(Vec::new());
};
($field: ident, option) => {
let mut $field = None;