Skip to content

Commit 25af9b7

Browse files
author
Antoine Riard
committed
Implement serialize/deserialize for Router.
Extend route_test to check if serialize/deserialize of NetworkMap works. Add PartialEq traits on some Router's structs. Modify also UnsignedNodeAnnouncement serialization
1 parent a5bcd56 commit 25af9b7

File tree

9 files changed

+420
-134
lines changed

9 files changed

+420
-134
lines changed

fuzz/fuzz_targets/router_target.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ pub fn do_test(data: &[u8]) {
125125
match <($MsgType)>::read(&mut reader) {
126126
Ok(msg) => msg,
127127
Err(e) => match e {
128-
msgs::DecodeError::UnknownVersion => return,
128+
msgs::DecodeError::UnknownVersion { .. } => return,
129129
msgs::DecodeError::UnknownRequiredFeature => return,
130130
msgs::DecodeError::InvalidValue => return,
131131
msgs::DecodeError::ExtraAddressesPerType => return,

src/ln/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3651,7 +3651,7 @@ impl<R : ::std::io::Read> ReadableArgs<R, Arc<Logger>> for Channel {
36513651
let _ver: u8 = Readable::read(reader)?;
36523652
let min_ver: u8 = Readable::read(reader)?;
36533653
if min_ver > SERIALIZATION_VERSION {
3654-
return Err(DecodeError::UnknownVersion);
3654+
return Err(DecodeError::UnknownVersion { byte: min_ver });
36553655
}
36563656

36573657
let user_id = Readable::read(reader)?;

src/ln/channelmanager.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ impl ChannelManager {
779779
match msgs::OnionHopData::read(&mut Cursor::new(&decoded[..])) {
780780
Err(err) => {
781781
let error_code = match err {
782-
msgs::DecodeError::UnknownVersion => 0x4000 | 1, // unknown realm byte
782+
msgs::DecodeError::UnknownVersion { .. } => 0x4000 | 1, // unknown realm byte
783783
_ => 0x2000 | 2, // Should never happen
784784
};
785785
return_err!("Unable to decode our hop data", error_code, &[0;0]);
@@ -2912,7 +2912,7 @@ impl<'a, R : ::std::io::Read> ReadableArgs<R, ChannelManagerReadArgs<'a>> for (S
29122912
let _ver: u8 = Readable::read(reader)?;
29132913
let min_ver: u8 = Readable::read(reader)?;
29142914
if min_ver > SERIALIZATION_VERSION {
2915-
return Err(DecodeError::UnknownVersion);
2915+
return Err(DecodeError::UnknownVersion { byte: min_ver });
29162916
}
29172917

29182918
let genesis_hash: Sha256dHash = Readable::read(reader)?;

src/ln/channelmonitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1913,7 +1913,7 @@ impl<R: ::std::io::Read> ReadableArgs<R, Arc<Logger>> for (Sha256dHash, ChannelM
19131913
let _ver: u8 = Readable::read(reader)?;
19141914
let min_ver: u8 = Readable::read(reader)?;
19151915
if min_ver > SERIALIZATION_VERSION {
1916-
return Err(DecodeError::UnknownVersion);
1916+
return Err(DecodeError::UnknownVersion { byte: min_ver });
19171917
}
19181918

19191919
let commitment_transaction_number_obscure_factor = <U48 as Readable<R>>::read(reader)?.0;

0 commit comments

Comments
 (0)