rustfmt: Run on lightning-invoice/src/payment.rs

Author: tnull

lightning-invoice/src/payment.rs

@@ -12,8 +12,8 @@
 use crate::Bolt11Invoice;
 use bitcoin::hashes::Hash;
 
-use lightning::ln::types::PaymentHash;
 use lightning::ln::channelmanager::RecipientOnionFields;
+use lightning::ln::types::PaymentHash;
 use lightning::routing::router::{PaymentParameters, RouteParameters};
 
 /// Builds the necessary parameters to pay or pre-flight probe the given zero-amount
@@ -28,8 +28,9 @@ use lightning::routing::router::{PaymentParameters, RouteParameters};
 ///
 /// [`ChannelManager::send_payment`]: lightning::ln::channelmanager::ChannelManager::send_payment
 /// [`ChannelManager::send_preflight_probes`]: lightning::ln::channelmanager::ChannelManager::send_preflight_probes
-pub fn payment_parameters_from_zero_amount_invoice(invoice: &Bolt11Invoice, amount_msat: u64)
--> Result<(PaymentHash, RecipientOnionFields, RouteParameters), ()> {
+pub fn payment_parameters_from_zero_amount_invoice(
+	invoice: &Bolt11Invoice, amount_msat: u64,
+) -> Result<(PaymentHash, RecipientOnionFields, RouteParameters), ()> {
 	if invoice.amount_milli_satoshis().is_some() {
 		Err(())
 	} else {
@@ -48,27 +49,30 @@ pub fn payment_parameters_from_zero_amount_invoice(invoice: &Bolt11Invoice, amou
 ///
 /// [`ChannelManager::send_payment`]: lightning::ln::channelmanager::ChannelManager::send_payment
 /// [`ChannelManager::send_preflight_probes`]: lightning::ln::channelmanager::ChannelManager::send_preflight_probes
-pub fn payment_parameters_from_invoice(invoice: &Bolt11Invoice)
--> Result<(PaymentHash, RecipientOnionFields, RouteParameters), ()> {
+pub fn payment_parameters_from_invoice(
+	invoice: &Bolt11Invoice,
+) -> Result<(PaymentHash, RecipientOnionFields, RouteParameters), ()> {
 	if let Some(amount_msat) = invoice.amount_milli_satoshis() {
 		Ok(params_from_invoice(invoice, amount_msat))
 	} else {
 		Err(())
 	}
 }
 
-fn params_from_invoice(invoice: &Bolt11Invoice, amount_msat: u64)
--> (PaymentHash, RecipientOnionFields, RouteParameters) {
+fn params_from_invoice(
+	invoice: &Bolt11Invoice, amount_msat: u64,
+) -> (PaymentHash, RecipientOnionFields, RouteParameters) {
 	let payment_hash = PaymentHash((*invoice.payment_hash()).to_byte_array());
 
 	let mut recipient_onion = RecipientOnionFields::secret_only(*invoice.payment_secret());
 	recipient_onion.payment_metadata = invoice.payment_metadata().map(|v| v.clone());
 
 	let mut payment_params = PaymentParameters::from_node_id(
-			invoice.recover_payee_pub_key(),
-			invoice.min_final_cltv_expiry_delta() as u32
-		)
-		.with_route_hints(invoice.route_hints()).unwrap();
+		invoice.recover_payee_pub_key(),
+		invoice.min_final_cltv_expiry_delta() as u32,
+	)
+	.with_route_hints(invoice.route_hints())
+	.unwrap();
 	if let Some(expiry) = invoice.expires_at() {
 		payment_params = payment_params.with_expiry_time(expiry.as_secs());
 	}
@@ -83,19 +87,18 @@ fn params_from_invoice(invoice: &Bolt11Invoice, amount_msat: u64)
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::{InvoiceBuilder, Currency};
+	use crate::{Currency, InvoiceBuilder};
 	use bitcoin::hashes::sha256::Hash as Sha256;
+	use core::time::Duration;
 	use lightning::ln::types::PaymentSecret;
 	use lightning::routing::router::Payee;
-	use secp256k1::{SecretKey, PublicKey, Secp256k1};
-	use core::time::Duration;
+	use secp256k1::{PublicKey, Secp256k1, SecretKey};
 	#[cfg(feature = "std")]
 	use std::time::SystemTime;
 
 	fn duration_since_epoch() -> Duration {
 		#[cfg(feature = "std")]
-		let duration_since_epoch =
-			SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap();
+		let duration_since_epoch = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap();
 		#[cfg(not(feature = "std"))]
 		let duration_since_epoch = Duration::from_secs(1234567);
 		duration_since_epoch
@@ -115,9 +118,7 @@ mod tests {
 			.duration_since_epoch(duration_since_epoch())
 			.min_final_cltv_expiry_delta(144)
 			.amount_milli_satoshis(128)
-			.build_signed(|hash| {
-				secp_ctx.sign_ecdsa_recoverable(hash, &private_key)
-			})
+			.build_signed(|hash| secp_ctx.sign_ecdsa_recoverable(hash, &private_key))
 			.unwrap();
 
 		assert!(payment_parameters_from_zero_amount_invoice(&invoice, 42).is_err());
@@ -147,14 +148,13 @@ mod tests {
 			.payment_secret(PaymentSecret([0; 32]))
 			.duration_since_epoch(duration_since_epoch())
 			.min_final_cltv_expiry_delta(144)
-			.build_signed(|hash| {
-				secp_ctx.sign_ecdsa_recoverable(hash, &private_key)
-			})
-		.unwrap();
+			.build_signed(|hash| secp_ctx.sign_ecdsa_recoverable(hash, &private_key))
+			.unwrap();
 
 		assert!(payment_parameters_from_invoice(&invoice).is_err());
 
-		let (hash, onion, params) = payment_parameters_from_zero_amount_invoice(&invoice, 42).unwrap();
+		let (hash, onion, params) =
+			payment_parameters_from_zero_amount_invoice(&invoice, 42).unwrap();
 		assert_eq!(&hash.0[..], &payment_hash[..]);
 		assert_eq!(onion.payment_secret, Some(PaymentSecret([0; 32])));
 		assert_eq!(params.final_value_msat, 42);
@@ -170,9 +170,9 @@ mod tests {
 	#[cfg(feature = "std")]
 	fn payment_metadata_end_to_end() {
 		use lightning::events::Event;
-		use lightning::ln::channelmanager::{Retry, PaymentId};
-		use lightning::ln::msgs::ChannelMessageHandler;
+		use lightning::ln::channelmanager::{PaymentId, Retry};
 		use lightning::ln::functional_test_utils::*;
+		use lightning::ln::msgs::ChannelMessageHandler;
 		// Test that a payment metadata read from an invoice passed to `pay_invoice` makes it all
 		// the way out through the `PaymentClaimable` event.
 		let chanmon_cfgs = create_chanmon_cfgs(2);
@@ -195,8 +195,10 @@ mod tests {
 			.amount_milli_satoshis(50_000)
 			.payment_metadata(payment_metadata.clone())
 			.build_signed(|hash| {
-				Secp256k1::new().sign_ecdsa_recoverable(hash,
-					&nodes[1].keys_manager.backing.get_node_secret_key())
+				Secp256k1::new().sign_ecdsa_recoverable(
+					hash,
+					&nodes[1].keys_manager.backing.get_node_secret_key(),
+				)
 			})
 			.unwrap();
 
@@ -216,7 +218,7 @@ mod tests {
 			Event::PaymentClaimable { onion_fields, .. } => {
 				assert_eq!(Some(payment_metadata), onion_fields.unwrap().payment_metadata);
 			},
-			_ => panic!("Unexpected event")
+			_ => panic!("Unexpected event"),
 		}
 	}
 }