[fuzz] Swap mode on most messages to account for TLV suffix

diff --git a/fuzz/src/msg_targets/gen_target.sh b/fuzz/src/msg_targets/gen_target.sh
index 0c1d061a74dc6047a334b386c05056349c04747e..2e1334841383e5f5b022f3d131338689bf823b9a 100755 (executable)
--- a/fuzz/src/msg_targets/gen_target.sh
+++ b/fuzz/src/msg_targets/gen_target.sh
@@ -11,36 +11,36 @@ echo "mod utils;" > mod.rs
 
 # Note when adding new targets here you should add a similar line in src/bin/gen_target.sh
 
-GEN_TEST AcceptChannel test_msg ""
-GEN_TEST AnnouncementSignatures test_msg ""
+GEN_TEST AcceptChannel test_msg_simple ""
+GEN_TEST AnnouncementSignatures test_msg_simple ""
+GEN_TEST ClosingSigned test_msg_simple ""
+GEN_TEST CommitmentSigned test_msg_simple ""
+GEN_TEST FundingCreated test_msg_simple ""
+GEN_TEST FundingLocked test_msg_simple ""
+GEN_TEST FundingSigned test_msg_simple ""
+GEN_TEST GossipTimestampFilter test_msg_simple ""
+GEN_TEST Init test_msg_simple ""
+GEN_TEST OnionHopData test_msg_simple ""
+GEN_TEST OpenChannel test_msg_simple ""
+GEN_TEST Ping test_msg_simple ""
+GEN_TEST Pong test_msg_simple ""
+GEN_TEST QueryChannelRange test_msg_simple ""
+GEN_TEST ReplyShortChannelIdsEnd test_msg_simple ""
+GEN_TEST RevokeAndACK test_msg_simple ""
+GEN_TEST Shutdown test_msg_simple ""
+GEN_TEST UpdateAddHTLC test_msg_simple ""
+GEN_TEST UpdateFailHTLC test_msg_simple ""
+GEN_TEST UpdateFailMalformedHTLC test_msg_simple ""
+GEN_TEST UpdateFee test_msg_simple ""
+GEN_TEST UpdateFulfillHTLC test_msg_simple ""
+
 GEN_TEST ChannelReestablish test_msg ""
-GEN_TEST CommitmentSigned test_msg ""
 GEN_TEST DecodedOnionErrorPacket test_msg ""
-GEN_TEST FundingCreated test_msg ""
-GEN_TEST FundingLocked test_msg ""
-GEN_TEST FundingSigned test_msg ""
-GEN_TEST OpenChannel test_msg ""
-GEN_TEST RevokeAndACK test_msg ""
-GEN_TEST Shutdown test_msg ""
-GEN_TEST UpdateFailHTLC test_msg ""
-GEN_TEST UpdateFailMalformedHTLC test_msg ""
-GEN_TEST UpdateFee test_msg ""
-GEN_TEST UpdateFulfillHTLC test_msg ""
 
 GEN_TEST ChannelAnnouncement test_msg_exact ""
 GEN_TEST NodeAnnouncement test_msg_exact ""
 GEN_TEST QueryShortChannelIds test_msg ""
-GEN_TEST ReplyShortChannelIdsEnd test_msg ""
-GEN_TEST QueryChannelRange test_msg ""
 GEN_TEST ReplyChannelRange test_msg ""
-GEN_TEST GossipTimestampFilter test_msg ""
 
-GEN_TEST UpdateAddHTLC test_msg_hole ", 85, 33"
 GEN_TEST ErrorMessage test_msg_hole ", 32, 2"
 GEN_TEST ChannelUpdate test_msg_hole ", 108, 1"
-
-GEN_TEST ClosingSigned test_msg_simple ""
-GEN_TEST Init test_msg_simple ""
-GEN_TEST OnionHopData test_msg_simple ""
-GEN_TEST Ping test_msg_simple ""
-GEN_TEST Pong test_msg_simple ""

diff --git a/fuzz/src/msg_targets/mod.rs b/fuzz/src/msg_targets/mod.rs
index 0f273cb7606d1e51b5304e5cfe46671c441e2b5f..af70c58e30ea2f9e9c5bfe330372cfe01948a8ce 100644 (file)
--- a/fuzz/src/msg_targets/mod.rs
+++ b/fuzz/src/msg_targets/mod.rs
@@ -1,31 +1,31 @@
 mod utils;
 pub mod msg_accept_channel;
 pub mod msg_announcement_signatures;
-pub mod msg_channel_reestablish;
+pub mod msg_closing_signed;
 pub mod msg_commitment_signed;
-pub mod msg_decoded_onion_error_packet;
 pub mod msg_funding_created;
 pub mod msg_funding_locked;
 pub mod msg_funding_signed;
+pub mod msg_gossip_timestamp_filter;
+pub mod msg_init;
+pub mod msg_onion_hop_data;
 pub mod msg_open_channel;
+pub mod msg_ping;
+pub mod msg_pong;
+pub mod msg_query_channel_range;
+pub mod msg_reply_short_channel_ids_end;
 pub mod msg_revoke_and_ack;
 pub mod msg_shutdown;
+pub mod msg_update_add_htlc;
 pub mod msg_update_fail_htlc;
 pub mod msg_update_fail_malformed_htlc;
 pub mod msg_update_fee;
 pub mod msg_update_fulfill_htlc;
+pub mod msg_channel_reestablish;
+pub mod msg_decoded_onion_error_packet;
 pub mod msg_channel_announcement;
 pub mod msg_node_announcement;
 pub mod msg_query_short_channel_ids;
-pub mod msg_reply_short_channel_ids_end;
-pub mod msg_query_channel_range;
 pub mod msg_reply_channel_range;
-pub mod msg_gossip_timestamp_filter;
-pub mod msg_update_add_htlc;
 pub mod msg_error_message;
 pub mod msg_channel_update;
-pub mod msg_closing_signed;
-pub mod msg_init;
-pub mod msg_onion_hop_data;
-pub mod msg_ping;
-pub mod msg_pong;

diff --git a/fuzz/src/msg_targets/msg_accept_channel.rs b/fuzz/src/msg_targets/msg_accept_channel.rs
index 095556d57d9e6fe4c9323b13d5ab6c4a49d8a1d0..a8ec438784bca1a4c6d4fae28d5d9fd2b735ce5f 100644 (file)
--- a/fuzz/src/msg_targets/msg_accept_channel.rs
+++ b/fuzz/src/msg_targets/msg_accept_channel.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_accept_channel_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::AcceptChannel, data);
+       test_msg_simple!(msgs::AcceptChannel, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_accept_channel_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::AcceptChannel, data);
+       test_msg_simple!(msgs::AcceptChannel, data);
 }

diff --git a/fuzz/src/msg_targets/msg_announcement_signatures.rs b/fuzz/src/msg_targets/msg_announcement_signatures.rs
index 138ab5dbf190392368d23b31f85b626143cfb656..0fc40fcb69bd7353a1a261370f81fccf166c3c32 100644 (file)
--- a/fuzz/src/msg_targets/msg_announcement_signatures.rs
+++ b/fuzz/src/msg_targets/msg_announcement_signatures.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_announcement_signatures_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::AnnouncementSignatures, data);
+       test_msg_simple!(msgs::AnnouncementSignatures, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_announcement_signatures_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::AnnouncementSignatures, data);
+       test_msg_simple!(msgs::AnnouncementSignatures, data);
 }

diff --git a/fuzz/src/msg_targets/msg_commitment_signed.rs b/fuzz/src/msg_targets/msg_commitment_signed.rs
index 9ac846f6f100194e272fe1ebef4c3adf08a83aea..163ce74460678cc6365cc2f94ccf11b70252e31d 100644 (file)
--- a/fuzz/src/msg_targets/msg_commitment_signed.rs
+++ b/fuzz/src/msg_targets/msg_commitment_signed.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_commitment_signed_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::CommitmentSigned, data);
+       test_msg_simple!(msgs::CommitmentSigned, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_commitment_signed_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::CommitmentSigned, data);
+       test_msg_simple!(msgs::CommitmentSigned, data);
 }

diff --git a/fuzz/src/msg_targets/msg_funding_created.rs b/fuzz/src/msg_targets/msg_funding_created.rs
index 3b61a64bf6a9f8b2d98ddfb0f686845f15a8c0ae..e0005cb082a4523d181fb94b344afe900a86d8fb 100644 (file)
--- a/fuzz/src/msg_targets/msg_funding_created.rs
+++ b/fuzz/src/msg_targets/msg_funding_created.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_funding_created_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::FundingCreated, data);
+       test_msg_simple!(msgs::FundingCreated, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_funding_created_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::FundingCreated, data);
+       test_msg_simple!(msgs::FundingCreated, data);
 }

diff --git a/fuzz/src/msg_targets/msg_funding_locked.rs b/fuzz/src/msg_targets/msg_funding_locked.rs
index 677af731895a847bf26c1b34da05680a3c6d9143..2c6ad63c96375dae55c448d862fec1e33389f0ed 100644 (file)
--- a/fuzz/src/msg_targets/msg_funding_locked.rs
+++ b/fuzz/src/msg_targets/msg_funding_locked.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_funding_locked_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::FundingLocked, data);
+       test_msg_simple!(msgs::FundingLocked, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_funding_locked_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::FundingLocked, data);
+       test_msg_simple!(msgs::FundingLocked, data);
 }

diff --git a/fuzz/src/msg_targets/msg_funding_signed.rs b/fuzz/src/msg_targets/msg_funding_signed.rs
index 388738ff2d480634a589fae57ec473bfc2bcd7c2..f0586e7b294a06b48200f304c35c51eb98160e51 100644 (file)
--- a/fuzz/src/msg_targets/msg_funding_signed.rs
+++ b/fuzz/src/msg_targets/msg_funding_signed.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_funding_signed_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::FundingSigned, data);
+       test_msg_simple!(msgs::FundingSigned, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_funding_signed_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::FundingSigned, data);
+       test_msg_simple!(msgs::FundingSigned, data);
 }

diff --git a/fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs b/fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs
index 73999cd3a86a403a1d51d6ab5b7e630af3fc74d8..448aaffc90c2b88432500cf6b08ea5143e0d61e1 100644 (file)
--- a/fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs
+++ b/fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_gossip_timestamp_filter_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::GossipTimestampFilter, data);
+       test_msg_simple!(msgs::GossipTimestampFilter, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_gossip_timestamp_filter_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::GossipTimestampFilter, data);
+       test_msg_simple!(msgs::GossipTimestampFilter, data);
 }

diff --git a/fuzz/src/msg_targets/msg_open_channel.rs b/fuzz/src/msg_targets/msg_open_channel.rs
index b0e96734e4c8f3706d948374e66f2ef2bc8b46a2..ce637c167efe20f83253ca7b5c39d969e5c88441 100644 (file)
--- a/fuzz/src/msg_targets/msg_open_channel.rs
+++ b/fuzz/src/msg_targets/msg_open_channel.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_open_channel_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::OpenChannel, data);
+       test_msg_simple!(msgs::OpenChannel, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_open_channel_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::OpenChannel, data);
+       test_msg_simple!(msgs::OpenChannel, data);
 }

diff --git a/fuzz/src/msg_targets/msg_query_channel_range.rs b/fuzz/src/msg_targets/msg_query_channel_range.rs
index bd16147f6417c2805493ec92edec77aac744f646..4b3de6aa895b151a6817acdbff939ac4598329ee 100644 (file)
--- a/fuzz/src/msg_targets/msg_query_channel_range.rs
+++ b/fuzz/src/msg_targets/msg_query_channel_range.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_query_channel_range_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::QueryChannelRange, data);
+       test_msg_simple!(msgs::QueryChannelRange, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_query_channel_range_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::QueryChannelRange, data);
+       test_msg_simple!(msgs::QueryChannelRange, data);
 }

diff --git a/fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs b/fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs
index fcd13154370b729b42966a917892847e8ff021e9..7634329a435a7d995aa3a52fd87e11744b8b6369 100644 (file)
--- a/fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs
+++ b/fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_reply_short_channel_ids_end_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::ReplyShortChannelIdsEnd, data);
+       test_msg_simple!(msgs::ReplyShortChannelIdsEnd, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_reply_short_channel_ids_end_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::ReplyShortChannelIdsEnd, data);
+       test_msg_simple!(msgs::ReplyShortChannelIdsEnd, data);
 }

diff --git a/fuzz/src/msg_targets/msg_revoke_and_ack.rs b/fuzz/src/msg_targets/msg_revoke_and_ack.rs
index 41f40becdfd0e7fdab951ef5cf88463290670b07..873939ca7c9d85b34c1d8cf15eb33f707adaec77 100644 (file)
--- a/fuzz/src/msg_targets/msg_revoke_and_ack.rs
+++ b/fuzz/src/msg_targets/msg_revoke_and_ack.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_revoke_and_ack_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::RevokeAndACK, data);
+       test_msg_simple!(msgs::RevokeAndACK, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_revoke_and_ack_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::RevokeAndACK, data);
+       test_msg_simple!(msgs::RevokeAndACK, data);
 }

diff --git a/fuzz/src/msg_targets/msg_shutdown.rs b/fuzz/src/msg_targets/msg_shutdown.rs
index 3e5358205cd6cc9cc50db92da5957a81c3dd1bcb..e6e74cc661a9c5c586cb98793281a42f7a3e1fd7 100644 (file)
--- a/fuzz/src/msg_targets/msg_shutdown.rs
+++ b/fuzz/src/msg_targets/msg_shutdown.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_shutdown_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::Shutdown, data);
+       test_msg_simple!(msgs::Shutdown, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_shutdown_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::Shutdown, data);
+       test_msg_simple!(msgs::Shutdown, data);
 }

diff --git a/fuzz/src/msg_targets/msg_update_add_htlc.rs b/fuzz/src/msg_targets/msg_update_add_htlc.rs
index d45eeadb19490f8a2ca92618fa93449a33a72e97..409f0fac8dff62e7f097ba6fad7a279230c29181 100644 (file)
--- a/fuzz/src/msg_targets/msg_update_add_htlc.rs
+++ b/fuzz/src/msg_targets/msg_update_add_htlc.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_update_add_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg_hole!(msgs::UpdateAddHTLC, data, 85, 33);
+       test_msg_simple!(msgs::UpdateAddHTLC, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_add_htlc_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg_hole!(msgs::UpdateAddHTLC, data, 85, 33);
+       test_msg_simple!(msgs::UpdateAddHTLC, data);
 }

diff --git a/fuzz/src/msg_targets/msg_update_fail_htlc.rs b/fuzz/src/msg_targets/msg_update_fail_htlc.rs
index 8fadde21030fe48f90e832b9d6609f29b1ce2a01..12d3f1c3fc3f0697d0cb0b5f130afa566fa7fca6 100644 (file)
--- a/fuzz/src/msg_targets/msg_update_fail_htlc.rs
+++ b/fuzz/src/msg_targets/msg_update_fail_htlc.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_update_fail_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::UpdateFailHTLC, data);
+       test_msg_simple!(msgs::UpdateFailHTLC, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_fail_htlc_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::UpdateFailHTLC, data);
+       test_msg_simple!(msgs::UpdateFailHTLC, data);
 }

diff --git a/fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs b/fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs
index 9d0481481bcd03042734f79bb9b981d53a5d4339..0b36070d1e59d6d5076ef6e4579c1ba92290cc25 100644 (file)
--- a/fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs
+++ b/fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_update_fail_malformed_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::UpdateFailMalformedHTLC, data);
+       test_msg_simple!(msgs::UpdateFailMalformedHTLC, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_fail_malformed_htlc_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::UpdateFailMalformedHTLC, data);
+       test_msg_simple!(msgs::UpdateFailMalformedHTLC, data);
 }

diff --git a/fuzz/src/msg_targets/msg_update_fee.rs b/fuzz/src/msg_targets/msg_update_fee.rs
index 318f5b089eb6d312fee4e71aaac4a81bab56433d..3c23a902f5723dab1fef5cc3fe2e7a01aee2a52b 100644 (file)
--- a/fuzz/src/msg_targets/msg_update_fee.rs
+++ b/fuzz/src/msg_targets/msg_update_fee.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_update_fee_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::UpdateFee, data);
+       test_msg_simple!(msgs::UpdateFee, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_fee_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::UpdateFee, data);
+       test_msg_simple!(msgs::UpdateFee, data);
 }

diff --git a/fuzz/src/msg_targets/msg_update_fulfill_htlc.rs b/fuzz/src/msg_targets/msg_update_fulfill_htlc.rs
index 692cb972f7817c3d09b29e2a29c3e7e9c521cfdd..460ff0e167880a6771804c0a19213233575ef4c8 100644 (file)
--- a/fuzz/src/msg_targets/msg_update_fulfill_htlc.rs
+++ b/fuzz/src/msg_targets/msg_update_fulfill_htlc.rs
@@ -17,11 +17,11 @@ use utils::test_logger;
 
 #[inline]
 pub fn msg_update_fulfill_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
-       test_msg!(msgs::UpdateFulfillHTLC, data);
+       test_msg_simple!(msgs::UpdateFulfillHTLC, data);
 }
 
 #[no_mangle]
 pub extern "C" fn msg_update_fulfill_htlc_run(data: *const u8, datalen: usize) {
        let data = unsafe { std::slice::from_raw_parts(data, datalen) };
-       test_msg!(msgs::UpdateFulfillHTLC, data);
+       test_msg_simple!(msgs::UpdateFulfillHTLC, data);
 }