f

Author: tnull

src/builder.rs

@@ -27,7 +27,6 @@ use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
 use lightning::log_trace;
 use lightning::routing::gossip::NodeAlias;
 use lightning::routing::router::DefaultRouter;
-use lightning_liquidity::lsps2::router::LSPS2BOLT12Router;
 use lightning::routing::scoring::{
 	CombinedScorer, ProbabilisticScorer, ProbabilisticScoringDecayParameters,
 	ProbabilisticScoringFeeParameters,
@@ -40,6 +39,7 @@ use lightning::util::persist::{
 };
 use lightning::util::ser::ReadableArgs;
 use lightning::util::sweep::OutputSweeper;
+use lightning_liquidity::lsps2::router::LSPS2BOLT12Router;
 use lightning_persister::fs_store::v1::FilesystemStore;
 use vss_client::headers::VssHeaderProvider;
 

src/event.rs

@@ -1333,12 +1333,6 @@ where
 				claim_from_onchain_tx,
 				outbound_amount_forwarded_msat,
 			} => {
-				let prev_channel_id = prev_htlcs.first().map(|h| h.channel_id);
-				let next_channel_id = next_htlcs.first().map(|h| h.channel_id);
-				let prev_user_channel_id = prev_htlcs.first().and_then(|h| h.user_channel_id);
-				let next_user_channel_id = next_htlcs.first().and_then(|h| h.user_channel_id);
-				let prev_node_id = prev_htlcs.first().and_then(|h| h.node_id);
-				let next_node_id = next_htlcs.first().and_then(|h| h.node_id);
 				{
 					let read_only_network_graph = self.network_graph.read_only();
 					let nodes = read_only_network_graph.nodes();
@@ -1659,26 +1653,24 @@ where
 
 				self.bump_tx_event_handler.handle_event(&bte).await;
 			},
-			LdkEvent::OnionMessageIntercepted { next_hop, message } => {
-				match next_hop {
-					lightning::blinded_path::message::NextMessageHop::NodeId(peer_node_id) => {
-						if let Some(om_mailbox) = self.om_mailbox.as_ref() {
-							om_mailbox.onion_message_intercepted(peer_node_id, message);
-						} else {
-							log_trace!(
-								self.logger,
-								"Onion message intercepted, but no onion message mailbox available"
-							);
-						}
-					},
-					lightning::blinded_path::message::NextMessageHop::ShortChannelId(scid) => {
+			LdkEvent::OnionMessageIntercepted { next_hop, message } => match next_hop {
+				lightning::blinded_path::message::NextMessageHop::NodeId(peer_node_id) => {
+					if let Some(om_mailbox) = self.om_mailbox.as_ref() {
+						om_mailbox.onion_message_intercepted(peer_node_id, message);
+					} else {
 						log_trace!(
 							self.logger,
-							"Onion message intercepted for unknown SCID {}, ignoring",
-							scid
+							"Onion message intercepted, but no onion message mailbox available"
 						);
-					},
-				}
+					}
+				},
+				lightning::blinded_path::message::NextMessageHop::ShortChannelId(scid) => {
+					log_trace!(
+						self.logger,
+						"Onion message intercepted for unknown SCID {}, ignoring",
+						scid
+					);
+				},
 			},
 			LdkEvent::OnionMessagePeerConnected { peer_node_id } => {
 				if let Some(om_mailbox) = self.om_mailbox.as_ref() {

src/payment/bolt12.rs

@@ -307,10 +307,7 @@ impl Bolt12Payment {
 		let (lsp_total_opening_fee, lsp_prop_opening_fee) = self.runtime.block_on(async move {
 			if let Some(amount_msat) = amount_msat {
 				liquidity_source
-					.lsps2_register_bolt12_payment_paths(
-						amount_msat,
-						max_total_lsp_fee_limit_msat,
-					)
+					.lsps2_register_bolt12_payment_paths(amount_msat, max_total_lsp_fee_limit_msat)
 					.await
 					.map(|total_fee| (Some(total_fee), None))
 			} else {

tests/integration_tests_rust.rs

@@ -2082,10 +2082,8 @@ async fn lsps2_bolt12_jit_channel_opens_successfully() {
 		.receive_via_jit_channel(jit_amount_msat, "jit-payment", None, Some(1), None)
 		.unwrap();
 
-	let payment_id = payer_node
-		.bolt12_payment()
-		.send(&offer, Some(1), Some("pay".to_string()), None)
-		.unwrap();
+	let payment_id =
+		payer_node.bolt12_payment().send(&offer, Some(1), Some("pay".to_string()), None).unwrap();
 
 	expect_channel_pending_event!(service_node, client_node.node_id());
 	expect_channel_ready_event!(service_node, client_node.node_id());