Skip to content

Commit a86e58e

Browse files
committed
Use LengthReadable trait for deserialization
Previously, our deserialization macros used the `Readable` trait by default. Now that `LengthReadable` is public and all `Readable` types also implement it, we can use `LengthReadable` instead.
1 parent 1edfeb6 commit a86e58e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lightning/src/ln/msgs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1964,7 +1964,7 @@ impl LengthReadable for TrampolineOnionPacket {
19641964

19651965
let hop_data_len = r.total_bytes().saturating_sub(66); // 1 (version) + 33 (pubkey) + 32 (HMAC) = 66
19661966
let mut rd = FixedLengthReader::new(r, hop_data_len);
1967-
let hop_data = WithoutLength::<Vec<u8>>::read(&mut rd)?.0;
1967+
let hop_data = WithoutLength::<Vec<u8>>::read_from_fixed_length_buffer(&mut rd)?.0;
19681968

19691969
let hmac = Readable::read(r)?;
19701970

lightning/src/util/ser_macros.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ macro_rules! _decode_tlv {
385385
($outer_reader: expr, $reader: expr, $field: ident, (static_value, $value: expr)) => {{
386386
}};
387387
($outer_reader: expr, $reader: expr, $field: ident, required) => {{
388-
$field = $crate::util::ser::Readable::read(&mut $reader)?;
388+
$field = $crate::util::ser::LengthReadable::read_from_fixed_length_buffer(&mut $reader)?;
389389
}};
390390
($outer_reader: expr, $reader: expr, $field: ident, (required: $trait: ident $(, $read_arg: expr)?)) => {{
391391
$field = $trait::read(&mut $reader $(, $read_arg)*)?;
@@ -395,7 +395,7 @@ macro_rules! _decode_tlv {
395395
$field = f.0;
396396
}};
397397
($outer_reader: expr, $reader: expr, $field: ident, option) => {{
398-
$field = Some($crate::util::ser::Readable::read(&mut $reader)?);
398+
$field = Some($crate::util::ser::LengthReadable::read_from_fixed_length_buffer(&mut $reader)?);
399399
}};
400400
($outer_reader: expr, $reader: expr, $field: ident, (option, explicit_type: $fieldty: ty)) => {{
401401
let _field: &Option<$fieldty> = &$field;
@@ -453,7 +453,7 @@ macro_rules! _decode_tlv {
453453
}};
454454
($outer_reader: expr, $reader: expr, $field: ident, (option, encoding: ($fieldty: ty, $encoding: ident))) => {{
455455
$field = {
456-
let field: $encoding<$fieldty> = ser::Readable::read(&mut $reader)?;
456+
let field: $encoding<$fieldty> = ser::LengthReadable::read_from_fixed_length_buffer(&mut $reader)?;
457457
Some(field.0)
458458
};
459459
}};

0 commit comments

Comments
 (0)