Skip to content

Commit dd04f90

Browse files
tnulltnull
committed
rustfmt: fuzz/src/msg_targets/* 
1 parent a0a29ec commit dd04f90

File tree

3 files changed

+70
-125
lines changed

3 files changed

+70
-125
lines changed

‎fuzz/src/msg_targets/mod.rs‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
1+
#[rustfmt::skip]
12
mod utils;
23
pub mod msg_accept_channel;
4+
pub mod msg_accept_channel_v2;
35
pub mod msg_announcement_signatures;
6+
pub mod msg_channel_announcement;
7+
pub mod msg_channel_details;
8+
pub mod msg_channel_ready;
9+
pub mod msg_channel_reestablish;
10+
pub mod msg_channel_update;
411
pub mod msg_closing_signed;
512
pub mod msg_commitment_signed;
13+
pub mod msg_decoded_onion_error_packet;
14+
pub mod msg_error_message;
615
pub mod msg_funding_created;
7-
pub mod msg_channel_ready;
816
pub mod msg_funding_signed;
917
pub mod msg_gossip_timestamp_filter;
1018
pub mod msg_init;
19+
pub mod msg_node_announcement;
1120
pub mod msg_open_channel;
21+
pub mod msg_open_channel_v2;
1222
pub mod msg_ping;
1323
pub mod msg_pong;
1424
pub mod msg_query_channel_range;
25+
pub mod msg_query_short_channel_ids;
26+
pub mod msg_reply_channel_range;
1527
pub mod msg_reply_short_channel_ids_end;
1628
pub mod msg_revoke_and_ack;
1729
pub mod msg_shutdown;
30+
pub mod msg_splice;
31+
pub mod msg_splice_ack;
32+
pub mod msg_splice_locked;
33+
pub mod msg_stfu;
34+
pub mod msg_tx_abort;
35+
pub mod msg_tx_ack_rbf;
36+
pub mod msg_tx_add_input;
37+
pub mod msg_tx_add_output;
38+
pub mod msg_tx_complete;
39+
pub mod msg_tx_init_rbf;
40+
pub mod msg_tx_remove_input;
41+
pub mod msg_tx_remove_output;
42+
pub mod msg_tx_signatures;
1843
pub mod msg_update_add_htlc;
1944
pub mod msg_update_fail_htlc;
2045
pub mod msg_update_fail_malformed_htlc;
2146
pub mod msg_update_fee;
2247
pub mod msg_update_fulfill_htlc;
23-
pub mod msg_channel_reestablish;
24-
pub mod msg_decoded_onion_error_packet;
25-
pub mod msg_channel_announcement;
26-
pub mod msg_node_announcement;
27-
pub mod msg_query_short_channel_ids;
28-
pub mod msg_reply_channel_range;
29-
pub mod msg_error_message;
3048
pub mod msg_warning_message;
31-
pub mod msg_channel_update;
32-
pub mod msg_channel_details;
33-
pub mod msg_open_channel_v2;
34-
pub mod msg_accept_channel_v2;
35-
pub mod msg_tx_add_input;
36-
pub mod msg_tx_add_output;
37-
pub mod msg_tx_remove_input;
38-
pub mod msg_tx_remove_output;
39-
pub mod msg_tx_complete;
40-
pub mod msg_tx_signatures;
41-
pub mod msg_tx_init_rbf;
42-
pub mod msg_tx_ack_rbf;
43-
pub mod msg_tx_abort;
44-
pub mod msg_stfu;
45-
pub mod msg_splice;
46-
pub mod msg_splice_ack;
47-
pub mod msg_splice_locked;

‎fuzz/src/msg_targets/utils.rs‎

Lines changed: 44 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -29,81 +29,73 @@ impl Writer for VecWriter {
2929
// entirely
3030
#[macro_export]
3131
macro_rules! test_msg {
32-
($MsgType: path, $data: ident) => {
33-
{
34-
use lightning::util::ser::{Writeable, Readable};
35-
let mut r = ::std::io::Cursor::new($data);
36-
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
37-
let p = r.position() as usize;
38-
let mut w = VecWriter(Vec::new());
39-
msg.write(&mut w).unwrap();
32+
($MsgType: path, $data: ident) => {{
33+
use lightning::util::ser::{Readable, Writeable};
34+
let mut r = ::std::io::Cursor::new($data);
35+
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
36+
let p = r.position() as usize;
37+
let mut w = VecWriter(Vec::new());
38+
msg.write(&mut w).unwrap();
4039

41-
assert_eq!(w.0.len(), p);
42-
assert_eq!(msg.serialized_length(), p);
43-
assert_eq!(&r.into_inner()[..p], &w.0[..p]);
44-
}
40+
assert_eq!(w.0.len(), p);
41+
assert_eq!(msg.serialized_length(), p);
42+
assert_eq!(&r.into_inner()[..p], &w.0[..p]);
4543
}
46-
}
44+
}};
4745
}
4846

4947
// Tests a message that may lose data on roundtrip, but shoulnd't lose data compared to our
5048
// re-serialization.
5149
#[macro_export]
5250
macro_rules! test_msg_simple {
53-
($MsgType: path, $data: ident) => {
54-
{
55-
use lightning::util::ser::{Writeable, Readable};
56-
let mut r = ::std::io::Cursor::new($data);
57-
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
58-
let mut w = VecWriter(Vec::new());
59-
msg.write(&mut w).unwrap();
60-
assert_eq!(msg.serialized_length(), w.0.len());
51+
($MsgType: path, $data: ident) => {{
52+
use lightning::util::ser::{Readable, Writeable};
53+
let mut r = ::std::io::Cursor::new($data);
54+
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
55+
let mut w = VecWriter(Vec::new());
56+
msg.write(&mut w).unwrap();
57+
assert_eq!(msg.serialized_length(), w.0.len());
6158

62-
let msg = <$MsgType as Readable>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap();
63-
let mut w_two = VecWriter(Vec::new());
64-
msg.write(&mut w_two).unwrap();
65-
assert_eq!(&w.0[..], &w_two.0[..]);
66-
}
59+
let msg = <$MsgType as Readable>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap();
60+
let mut w_two = VecWriter(Vec::new());
61+
msg.write(&mut w_two).unwrap();
62+
assert_eq!(&w.0[..], &w_two.0[..]);
6763
}
68-
}
64+
}};
6965
}
7066

7167
// Tests a message that must survive roundtrip exactly, and must exactly empty the read buffer and
7268
// split it back out on re-serialization.
7369
#[macro_export]
7470
macro_rules! test_msg_exact {
75-
($MsgType: path, $data: ident) => {
76-
{
77-
use lightning::util::ser::{Writeable, Readable};
78-
let mut r = ::std::io::Cursor::new($data);
79-
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
80-
let mut w = VecWriter(Vec::new());
81-
msg.write(&mut w).unwrap();
82-
assert_eq!(&r.into_inner()[..], &w.0[..]);
83-
assert_eq!(msg.serialized_length(), w.0.len());
84-
}
71+
($MsgType: path, $data: ident) => {{
72+
use lightning::util::ser::{Readable, Writeable};
73+
let mut r = ::std::io::Cursor::new($data);
74+
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
75+
let mut w = VecWriter(Vec::new());
76+
msg.write(&mut w).unwrap();
77+
assert_eq!(&r.into_inner()[..], &w.0[..]);
78+
assert_eq!(msg.serialized_length(), w.0.len());
8579
}
86-
}
80+
}};
8781
}
8882

8983
// Tests a message that must survive roundtrip exactly, modulo one "hole" which may be set to
9084
// any value on re-serialization.
9185
#[macro_export]
9286
macro_rules! test_msg_hole {
93-
($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {
94-
{
95-
use lightning::util::ser::{Writeable, Readable};
96-
let mut r = ::std::io::Cursor::new($data);
97-
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
98-
let mut w = VecWriter(Vec::new());
99-
msg.write(&mut w).unwrap();
100-
let p = w.0.len() as usize;
101-
assert_eq!(msg.serialized_length(), p);
87+
($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {{
88+
use lightning::util::ser::{Readable, Writeable};
89+
let mut r = ::std::io::Cursor::new($data);
90+
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
91+
let mut w = VecWriter(Vec::new());
92+
msg.write(&mut w).unwrap();
93+
let p = w.0.len() as usize;
94+
assert_eq!(msg.serialized_length(), p);
10295

103-
assert_eq!(w.0.len(), p);
104-
assert_eq!(&r.get_ref()[..$hole], &w.0[..$hole]);
105-
assert_eq!(&r.get_ref()[$hole+$hole_len..p], &w.0[$hole+$hole_len..]);
106-
}
96+
assert_eq!(w.0.len(), p);
97+
assert_eq!(&r.get_ref()[..$hole], &w.0[..$hole]);
98+
assert_eq!(&r.get_ref()[$hole + $hole_len..p], &w.0[$hole + $hole_len..]);
10799
}
108-
}
100+
}};
109101
}

‎rustfmt_excluded_files‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,4 @@
11
./bench/benches/bench.rs
2-
./fuzz/src/msg_targets/mod.rs
3-
./fuzz/src/msg_targets/msg_accept_channel.rs
4-
./fuzz/src/msg_targets/msg_accept_channel_v2.rs
5-
./fuzz/src/msg_targets/msg_announcement_signatures.rs
6-
./fuzz/src/msg_targets/msg_channel_announcement.rs
7-
./fuzz/src/msg_targets/msg_channel_details.rs
8-
./fuzz/src/msg_targets/msg_channel_ready.rs
9-
./fuzz/src/msg_targets/msg_channel_reestablish.rs
10-
./fuzz/src/msg_targets/msg_channel_update.rs
11-
./fuzz/src/msg_targets/msg_closing_signed.rs
12-
./fuzz/src/msg_targets/msg_commitment_signed.rs
13-
./fuzz/src/msg_targets/msg_decoded_onion_error_packet.rs
14-
./fuzz/src/msg_targets/msg_error_message.rs
15-
./fuzz/src/msg_targets/msg_funding_created.rs
16-
./fuzz/src/msg_targets/msg_funding_signed.rs
17-
./fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs
18-
./fuzz/src/msg_targets/msg_init.rs
19-
./fuzz/src/msg_targets/msg_node_announcement.rs
20-
./fuzz/src/msg_targets/msg_open_channel.rs
21-
./fuzz/src/msg_targets/msg_open_channel_v2.rs
22-
./fuzz/src/msg_targets/msg_ping.rs
23-
./fuzz/src/msg_targets/msg_pong.rs
24-
./fuzz/src/msg_targets/msg_query_channel_range.rs
25-
./fuzz/src/msg_targets/msg_query_short_channel_ids.rs
26-
./fuzz/src/msg_targets/msg_reply_channel_range.rs
27-
./fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs
28-
./fuzz/src/msg_targets/msg_revoke_and_ack.rs
29-
./fuzz/src/msg_targets/msg_shutdown.rs
30-
./fuzz/src/msg_targets/msg_splice.rs
31-
./fuzz/src/msg_targets/msg_splice_ack.rs
32-
./fuzz/src/msg_targets/msg_splice_locked.rs
33-
./fuzz/src/msg_targets/msg_stfu.rs
34-
./fuzz/src/msg_targets/msg_tx_abort.rs
35-
./fuzz/src/msg_targets/msg_tx_ack_rbf.rs
36-
./fuzz/src/msg_targets/msg_tx_add_input.rs
37-
./fuzz/src/msg_targets/msg_tx_add_output.rs
38-
./fuzz/src/msg_targets/msg_tx_complete.rs
39-
./fuzz/src/msg_targets/msg_tx_init_rbf.rs
40-
./fuzz/src/msg_targets/msg_tx_remove_input.rs
41-
./fuzz/src/msg_targets/msg_tx_remove_output.rs
42-
./fuzz/src/msg_targets/msg_tx_signatures.rs
43-
./fuzz/src/msg_targets/msg_update_add_htlc.rs
44-
./fuzz/src/msg_targets/msg_update_fail_htlc.rs
45-
./fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs
46-
./fuzz/src/msg_targets/msg_update_fee.rs
47-
./fuzz/src/msg_targets/msg_update_fulfill_htlc.rs
48-
./fuzz/src/msg_targets/msg_warning_message.rs
49-
./fuzz/src/msg_targets/utils.rs
502
./fuzz/src/offer_deser.rs
513
./fuzz/src/onion_hop_data.rs
524
./fuzz/src/onion_message.rs

0 commit comments

Comments
 (0)