Skip to content

Commit 9ae25a8

Browse files
committed
Rename LengthReadable's read method
In this commit we rename this method to `read_from_fixed_length_buffer` to avoid ambiguities with `Readable`.
1 parent 31b32c5 commit 9ae25a8

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

lightning/src/ln/msgs.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1958,7 +1958,7 @@ impl Writeable for TrampolineOnionPacket {
19581958
}
19591959

19601960
impl LengthReadable for TrampolineOnionPacket {
1961-
fn read<R: LengthRead>(r: &mut R) -> Result<Self, DecodeError> {
1961+
fn read_from_fixed_length_buffer<R: LengthRead>(r: &mut R) -> Result<Self, DecodeError> {
19621962
let version = Readable::read(r)?;
19631963
let public_key = Readable::read(r)?;
19641964

@@ -2684,7 +2684,7 @@ impl Readable for OnionMessage {
26842684
let len: u16 = Readable::read(r)?;
26852685
let mut packet_reader = FixedLengthReader::new(r, len as u64);
26862686
let onion_routing_packet: onion_message::packet::Packet =
2687-
<onion_message::packet::Packet as LengthReadable>::read(&mut packet_reader)?;
2687+
<onion_message::packet::Packet as LengthReadable>::read_from_fixed_length_buffer(&mut packet_reader)?;
26882688
Ok(Self {
26892689
blinding_point,
26902690
onion_routing_packet,
@@ -4708,7 +4708,7 @@ mod tests {
47084708
{ // verify that a codec round trip works
47094709
let mut reader = Cursor::new(&encoded_trampoline_packet);
47104710
let mut trampoline_packet_reader = FixedLengthReader::new(&mut reader, encoded_trampoline_packet.len() as u64);
4711-
let decoded_trampoline_packet: TrampolineOnionPacket = <TrampolineOnionPacket as LengthReadable>::read(&mut trampoline_packet_reader).unwrap();
4711+
let decoded_trampoline_packet: TrampolineOnionPacket = <TrampolineOnionPacket as LengthReadable>::read_from_fixed_length_buffer(&mut trampoline_packet_reader).unwrap();
47124712
assert_eq!(decoded_trampoline_packet.encode(), encoded_trampoline_packet);
47134713
}
47144714

lightning/src/onion_message/functional_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ fn spec_test_vector() {
901901
let mut reader = io::Cursor::new(sender_to_alice_packet_bytes);
902902
let mut packet_reader = FixedLengthReader::new(&mut reader, sender_to_alice_packet_bytes_len);
903903
let sender_to_alice_packet: Packet =
904-
<Packet as LengthReadable>::read(&mut packet_reader).unwrap();
904+
<Packet as LengthReadable>::read_from_fixed_length_buffer(&mut packet_reader).unwrap();
905905
let secp_ctx = Secp256k1::new();
906906
let sender_to_alice_om = msgs::OnionMessage {
907907
blinding_point: PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&<Vec<u8>>::from_hex("6363636363636363636363636363636363636363636363636363636363636363").unwrap()).unwrap()),

lightning/src/onion_message/packet.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl Writeable for Packet {
8282
}
8383

8484
impl LengthReadable for Packet {
85-
fn read<R: LengthRead>(r: &mut R) -> Result<Self, DecodeError> {
85+
fn read_from_fixed_length_buffer<R: LengthRead>(r: &mut R) -> Result<Self, DecodeError> {
8686
const READ_BUFFER_SIZE: usize = 4096;
8787

8888
let version = Readable::read(r)?;

lightning/src/util/ser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ where
368368
Self: Sized,
369369
{
370370
/// Reads a `Self` in from the given [`LengthRead`].
371-
fn read<R: LengthRead>(reader: &mut R) -> Result<Self, DecodeError>;
371+
fn read_from_fixed_length_buffer<R: LengthRead>(reader: &mut R) -> Result<Self, DecodeError>;
372372
}
373373

374374
/// A trait that various LDK types implement allowing them to (maybe) be read in from a [`Read`].

0 commit comments

Comments
 (0)