Move send_probe_along_path

Author: tnull

lightning-invoice/src/payment.rs

@@ -434,23 +434,6 @@ where
 			.map_err(|e| { self.payment_cache.lock().unwrap().remove(&payment_hash); e })
 	}
 
-	/// Sends a probe payment along the given path. The resulting payment will not be cached and
-	/// resulting failures will be handled differently from regular payments.
-	pub fn send_probe_along_path(
-		&self, pubkey: PublicKey, hops: &[PublicKey], amount_msats: u64, final_cltv_expiry_delta: u32
-	) -> Result<PaymentId, PaymentError> {
-		let route_params = RouteParameters {
-			payment_params: PaymentParameters::for_keysend(pubkey),
-			final_value_msat: amount_msats,
-			final_cltv_expiry_delta,
-		};
-		let payer = self.payer.node_id();
-		let route = self.router.build_route_from_hops(&payer, hops, &route_params)
-			.map_err(|e| PaymentError::Routing(e))?;
-
-		self.payer.send_probe_payment(&route).map_err(|e| PaymentError::Sending(e))
-	}
-
 	fn pay_internal<F: FnOnce(&Route) -> Result<PaymentId, PaymentSendFailure> + Copy>(
 		&self, params: &RouteParameters, payment_hash: PaymentHash, send_payment: F,
 	) -> Result<PaymentId, PaymentError> {
@@ -565,6 +548,24 @@ where
 	pub fn remove_cached_payment(&self, payment_hash: &PaymentHash) {
 		self.payment_cache.lock().unwrap().remove(payment_hash);
 	}
+
+	/// Sends a probe payment along the given path. The resulting payment will not be cached and
+	/// resulting failures will be handled differently from regular payments.
+	pub fn send_probe_along_path(
+		&self, pubkey: PublicKey, hops: &[PublicKey], amount_msats: u64, final_cltv_expiry_delta: u32
+	) -> Result<PaymentId, PaymentError> {
+		let route_params = RouteParameters {
+			payment_params: PaymentParameters::for_keysend(pubkey),
+			final_value_msat: amount_msats,
+			final_cltv_expiry_delta,
+		};
+		let payer = self.payer.node_id();
+		let route = self.router.build_route_from_hops(&payer, hops, &route_params)
+			.map_err(|e| PaymentError::Routing(e))?;
+
+		self.payer.send_probe_payment(&route).map_err(|e| PaymentError::Sending(e))
+	}
+
 }
 
 fn expiry_time_from_unix_epoch(invoice: &Invoice) -> Duration {