Update fuzzing generated code to conform to rustfmt.

Author: valentinewallace

fuzz/src/bin/target_template.txt

@@ -7,7 +7,8 @@ extern crate lightning_fuzz;
 use lightning_fuzz::TARGET_MOD::*;
 
 #[cfg(feature = "afl")]
-#[macro_use] extern crate afl;
+#[macro_use]
+extern crate afl;
 #[cfg(feature = "afl")]
 fn main() {
 	fuzz!(|data| {
@@ -16,7 +17,8 @@ fn main() {
 }
 
 #[cfg(feature = "honggfuzz")]
-#[macro_use] extern crate honggfuzz;
+#[macro_use]
+extern crate honggfuzz;
 #[cfg(feature = "honggfuzz")]
 fn main() {
 	loop {
@@ -27,7 +29,8 @@ fn main() {
 }
 
 #[cfg(feature = "libfuzzer_fuzz")]
-#[macro_use] extern crate libfuzzer_sys;
+#[macro_use]
+extern crate libfuzzer_sys;
 #[cfg(feature = "libfuzzer_fuzz")]
 fuzz_target!(|data: &[u8]| {
 	TARGET_NAME_run(data.as_ptr(), data.len());
@@ -44,9 +47,9 @@ fn main() {
 
 #[test]
 fn run_test_cases() {
+	use lightning_fuzz::utils::test_logger::StringBuffer;
 	use std::fs;
 	use std::io::Read;
-	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};
 	{
@@ -64,20 +67,25 @@ fn run_test_cases() {
 
 			let thread_count_ref = Arc::clone(&threads_running);
 			let main_thread_ref = std::thread::current();
-			threads.push((path.file_name().unwrap().to_str().unwrap().to_string(),
+			threads.push((
+				path.file_name().unwrap().to_str().unwrap().to_string(),
 				std::thread::spawn(move || {
 					let string_logger = StringBuffer::new();
 
 					let panic_logger = string_logger.clone();
 					let res = if ::std::panic::catch_unwind(move || {
 						TARGET_NAME_test(&data, panic_logger);
-					}).is_err() {
+					})
+					.is_err()
+					{
 						Some(string_logger.into_string())
-					} else { None };
+					} else {
+						None
+					};
 					thread_count_ref.fetch_sub(1, atomic::Ordering::AcqRel);
 					main_thread_ref.unpark();
 					res
-				})
+				}),
 			));
 			while threads_running.load(atomic::Ordering::Acquire) > 32 {
 				std::thread::park();

fuzz/src/msg_targets/gen_target.sh

@@ -7,35 +7,33 @@ GEN_TEST() {
 	echo "pub mod $tn;" >> mod.rs
 }
 
-echo "mod utils;" > mod.rs
+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 ChannelAnnouncement test_msg_exact ""
 GEN_TEST ChannelReestablish test_msg ""
+GEN_TEST ChannelUpdate test_msg_exact ""
 GEN_TEST ClosingSigned test_msg ""
 GEN_TEST CommitmentSigned test_msg ""
 GEN_TEST DecodedOnionErrorPacket test_msg ""
+GEN_TEST ErrorMessage test_msg_hole ", 32, 2"
 GEN_TEST FundingCreated test_msg ""
 GEN_TEST FundingLocked test_msg ""
 GEN_TEST FundingSigned test_msg ""
+GEN_TEST Init test_msg_simple ""
+GEN_TEST NodeAnnouncement test_msg_exact ""
+GEN_TEST OnionHopData test_msg_simple ""
 GEN_TEST OpenChannel test_msg ""
+GEN_TEST Ping test_msg_simple ""
+GEN_TEST Pong test_msg_simple ""
 GEN_TEST RevokeAndACK test_msg ""
 GEN_TEST Shutdown test_msg ""
+GEN_TEST UpdateAddHTLC test_msg_hole ", 85, 33"
 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 ChannelUpdate test_msg_exact ""
-GEN_TEST NodeAnnouncement test_msg_exact ""
-
-GEN_TEST UpdateAddHTLC test_msg_hole ", 85, 33"
-GEN_TEST ErrorMessage test_msg_hole ", 32, 2"
-
-GEN_TEST Init test_msg_simple ""
-GEN_TEST OnionHopData test_msg_simple ""
-GEN_TEST Ping test_msg_simple ""
-GEN_TEST Pong test_msg_simple ""

fuzz/src/msg_targets/mod.rs

@@ -1,26 +1,27 @@
 mod utils;
+
 pub mod msg_accept_channel;
 pub mod msg_announcement_signatures;
+pub mod msg_channel_announcement;
 pub mod msg_channel_reestablish;
+pub mod msg_channel_update;
 pub mod msg_closing_signed;
 pub mod msg_commitment_signed;
 pub mod msg_decoded_onion_error_packet;
+pub mod msg_error_message;
 pub mod msg_funding_created;
 pub mod msg_funding_locked;
 pub mod msg_funding_signed;
+pub mod msg_init;
+pub mod msg_node_announcement;
+pub mod msg_onion_hop_data;
 pub mod msg_open_channel;
+pub mod msg_ping;
+pub mod msg_pong;
 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_announcement;
-pub mod msg_channel_update;
-pub mod msg_node_announcement;
-pub mod msg_update_add_htlc;
-pub mod msg_error_message;
-pub mod msg_init;
-pub mod msg_onion_hop_data;
-pub mod msg_ping;
-pub mod msg_pong;