Restore ChannelManager::send_payment_with_route

e41e756 removed
`ChannelManager::send_payment_with_route` due to a rebase error as
it was originally written when `send_payment_with_route` had been
made test-only.

Here we restore it to be public.

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -56,9 +56,7 @@ use crate::types::features::{Bolt12InvoiceFeatures, ChannelFeatures, ChannelType
 use crate::types::features::Bolt11InvoiceFeatures;
 #[cfg(trampoline)]
 use crate::routing::gossip::NodeId;
-use crate::routing::router::{BlindedTail, InFlightHtlcs, Path, Payee, PaymentParameters, RouteParameters, RouteParametersConfig, Router};
-#[cfg(any(feature = "_test_utils", test))]
-use crate::routing::router::{FixedRouter, Route};
+use crate::routing::router::{BlindedTail, InFlightHtlcs, Path, Payee, PaymentParameters, RouteParameters, RouteParametersConfig, Router, FixedRouter, Route};
 use crate::ln::onion_payment::{check_incoming_htlc_cltv, create_recv_pending_htlc_info, create_fwd_pending_htlc_info, decode_incoming_update_add_htlc_onion, InboundHTLCErr, NextPacketDetails};
 use crate::ln::msgs;
 use crate::ln::onion_utils;
@@ -4670,7 +4668,6 @@ where
 	///
 	/// LDK will not automatically retry this payment, though it may be manually re-sent after an
 	/// [`Event::PaymentFailed`] is generated.
-	#[cfg(any(test, feature = "_test_utils"))]
 	pub fn send_payment_with_route(
 		&self, mut route: Route, payment_hash: PaymentHash, recipient_onion: RecipientOnionFields,
 		payment_id: PaymentId

lightning/src/routing/router.rs

@@ -25,7 +25,6 @@ use crate::offers::invoice::Bolt12Invoice;
 use crate::routing::gossip::{DirectedChannelInfo, EffectiveCapacity, ReadOnlyNetworkGraph, NetworkGraph, NodeId};
 use crate::routing::scoring::{ChannelUsage, LockableScore, ScoreLookUp};
 use crate::sign::EntropySource;
-#[cfg(any(test, feature = "_test_utils"))]
 use crate::sync::Mutex;
 use crate::util::ser::{Writeable, Readable, ReadableArgs, Writer};
 use crate::util::logger::Logger;
@@ -190,20 +189,17 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, ES: Deref, S: Deref, SP: Size
 /// A `Router` that returns a fixed route one time, erroring otherwise. Useful for
 /// `ChannelManager::send_payment_with_route` to support sending to specific routes without
 /// requiring a custom `Router` implementation.
-#[cfg(any(test, feature = "_test_utils"))]
 pub(crate) struct FixedRouter {
 	// Use an `Option` to avoid needing to clone the route when `find_route` is called.
 	route: Mutex<Option<Route>>,
 }
 
-#[cfg(any(test, feature = "_test_utils"))]
 impl FixedRouter {
 	pub(crate) fn new(route: Route) -> Self {
 		Self { route: Mutex::new(Some(route)) }
 	}
 }
 
-#[cfg(any(test, feature = "_test_utils"))]
 impl Router for FixedRouter {
 	fn find_route(
 		&self, _payer: &PublicKey, _route_params: &RouteParameters,