f fmt

Author: TheBlueMatt

fuzz/src/full_stack.rs

@@ -837,11 +837,11 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>
 			},
 			16 => {
 				let payment_preimage = PaymentPreimage(keys_manager.get_secure_random_bytes());
-				let payment_hash =
+				let hash =
 					PaymentHash(Sha256::hash(&payment_preimage.0[..]).to_byte_array());
 				// Note that this may fail - our hashes may collide and we'll end up trying to
 				// double-register the same payment_hash.
-				let _ = channelmanager.create_inbound_payment_for_hash(payment_hash, None, 1, None, None);
+				let _ = channelmanager.create_inbound_payment_for_hash(hash, None, 1, None, None);
 			},
 			9 => {
 				for payment in payments_received.drain(..) {

lightning/src/ln/inbound_payment.rs

@@ -364,8 +364,7 @@ fn construct_payment_secret(
 /// [`create_inbound_payment_for_hash`]: crate::ln::channelmanager::ChannelManager::create_inbound_payment_for_hash
 pub(super) fn verify<L: Logger>(
 	payment_hash: PaymentHash, payment_data: &msgs::FinalOnionHopData,
-	payment_metadata: Option<&[u8]>, highest_seen_timestamp: u64, keys: &ExpandedKey,
-	logger: &L,
+	payment_metadata: Option<&[u8]>, highest_seen_timestamp: u64, keys: &ExpandedKey, logger: &L,
 ) -> Result<(Option<PaymentPreimage>, Option<u16>), ()> {
 	let (iv_bytes, info_bytes) = decrypt_info(payment_data.payment_secret, keys);
 

lightning/src/ln/max_payment_path_len_tests.rs

@@ -82,7 +82,7 @@ fn large_payment_metadata() {
 
 	let mut counter = 42;
 	macro_rules! get_payment_hash {
-		($node: expr, $metadata: expr) => { {
+		($node: expr, $metadata: expr) => {{
 			let payment_preimage = PaymentPreimage([counter; 32]);
 			counter += 1;
 			let payment_hash: PaymentHash = payment_preimage.into();
@@ -97,11 +97,12 @@ fn large_payment_metadata() {
 				)
 				.unwrap();
 			(payment_hash, payment_preimage, payment_secret)
-		} };
+		}};
 	}
 
 	// Check that the maximum-size metadata is sendable.
-	let (payment_hash, payment_preimage, payment_secret) = get_payment_hash!(nodes[1], &payment_metadata);
+	let (payment_hash, payment_preimage, payment_secret) =
+		get_payment_hash!(nodes[1], &payment_metadata);
 	let (mut route_0_1, ..) = get_route_and_payment_hash!(&nodes[0], &nodes[1], amt_msat);
 	let mut max_sized_onion = RecipientOnionFields {
 		payment_secret: Some(payment_secret),