Merge branch 'lightningdevkit:main' into mhr/closure_reason_abandoned

ci/rustfmt.sh

@@ -15,5 +15,5 @@ TMP_FILE=$(mktemp)
 find . -name '*.rs' -type f |sort >$TMP_FILE
 for file in $(comm -23 $TMP_FILE rustfmt_excluded_files); do
 	echo "Checking formatting of $file"
-	rustfmt $VERS --check $file
+	rustfmt $VERS --edition 2021 --check $file
 done

fuzz/src/base32.rs

@@ -16,29 +16,35 @@ pub fn do_test(data: &[u8]) {
 	if let Ok(s) = std::str::from_utf8(data) {
 		let first_decoding = base32::Alphabet::RFC4648 { padding: true }.decode(s);
 		if let Ok(first_decoding) = first_decoding {
-			let encoding_response = base32::Alphabet::RFC4648 { padding: true }.encode(&first_decoding);
+			let encoding_response =
+				base32::Alphabet::RFC4648 { padding: true }.encode(&first_decoding);
 			assert_eq!(encoding_response, s.to_ascii_uppercase());
-			let second_decoding = base32::Alphabet::RFC4648 { padding: true }.decode(&encoding_response).unwrap();
+			let second_decoding =
+				base32::Alphabet::RFC4648 { padding: true }.decode(&encoding_response).unwrap();
 			assert_eq!(first_decoding, second_decoding);
 		}
 	}
 
 	if let Ok(s) = std::str::from_utf8(data) {
 		let first_decoding = base32::Alphabet::RFC4648 { padding: false }.decode(s);
 		if let Ok(first_decoding) = first_decoding {
-			let encoding_response = base32::Alphabet::RFC4648 { padding: false }.encode(&first_decoding);
+			let encoding_response =
+				base32::Alphabet::RFC4648 { padding: false }.encode(&first_decoding);
 			assert_eq!(encoding_response, s.to_ascii_uppercase());
-			let second_decoding = base32::Alphabet::RFC4648 { padding: false }.decode(&encoding_response).unwrap();
+			let second_decoding =
+				base32::Alphabet::RFC4648 { padding: false }.decode(&encoding_response).unwrap();
 			assert_eq!(first_decoding, second_decoding);
 		}
 	}
-	
+
 	let encode_response = base32::Alphabet::RFC4648 { padding: false }.encode(&data);
-	let decode_response = base32::Alphabet::RFC4648 { padding: false }.decode(&encode_response).unwrap();
+	let decode_response =
+		base32::Alphabet::RFC4648 { padding: false }.decode(&encode_response).unwrap();
 	assert_eq!(data, decode_response);
 
 	let encode_response = base32::Alphabet::RFC4648 { padding: true }.encode(&data);
-	let decode_response = base32::Alphabet::RFC4648 { padding: true }.decode(&encode_response).unwrap();
+	let decode_response =
+		base32::Alphabet::RFC4648 { padding: true }.decode(&encode_response).unwrap();
 	assert_eq!(data, decode_response);
 }
 

fuzz/src/bin/base32_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/bech32_parse_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/bolt11_deser_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/chanmon_consistency_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/chanmon_deser_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/fromstr_to_netaddress_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/full_stack_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/indexedmap_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/invoice_deser_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/invoice_request_deser_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_accept_channel_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_accept_channel_v2_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_announcement_signatures_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_channel_announcement_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_channel_details_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_channel_ready_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_channel_reestablish_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_channel_update_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_closing_signed_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_commitment_signed_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_decoded_onion_error_packet_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_error_message_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_funding_created_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_funding_signed_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_gossip_timestamp_filter_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_init_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_node_announcement_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_open_channel_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_open_channel_v2_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_ping_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_pong_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_query_channel_range_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_query_short_channel_ids_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_reply_channel_range_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_reply_short_channel_ids_end_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_revoke_and_ack_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_shutdown_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_splice_ack_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_splice_locked_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_splice_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_stfu_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_tx_abort_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");

fuzz/src/bin/msg_tx_ack_rbf_target.rs

@@ -11,6 +11,7 @@
 // To modify it, modify target_template.txt and run gen_target.sh instead.
 
 #![cfg_attr(feature = "libfuzzer_fuzz", no_main)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
 
 #[cfg(not(fuzzing))]
 compile_error!("Fuzz targets need cfg=fuzzing");