Trivial #3016 followups

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/ln/functional_test_utils.rs

@@ -513,7 +513,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// Toggles this node's signer to be available for the given signer operation.
 	/// This is useful for testing behavior for restoring an async signer that previously
 	/// could not return a signature immediately.
-pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
+	pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
  self.set_channel_signer_ops(peer_id, chan_id, signer_op, true);
 	}
 
@@ -532,7 +532,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// will behave normally, returning `Ok`. When set to `false`, and the channel signer will
 	/// act like an off-line remote signer, returning `Err`. This applies to the signer in all
 	/// relevant places, i.e. the channel manager, chain monitor, and the keys manager.
-fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
+	fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
  use crate::sign::ChannelSigner;
  log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);
 
@@ -2549,11 +2549,12 @@ pub fn expect_payment_failed_conditions_event<'a, 'b, 'c, 'd, 'e>(
 	if conditions.expected_mpp_parts_remain { assert_eq!(payment_failed_events.len(), 1); } else { assert_eq!(payment_failed_events.len(), 2); }
 	let expected_payment_id = match &payment_failed_events[0] {
  Event::PaymentPathFailed { payment_hash, payment_failed_permanently, payment_id, failure,
- error_code,
- error_data, .. } => {
+ error_code,
+ error_data, ..
+ } => {
  assert_eq!(*payment_hash, expected_payment_hash, "unexpected payment_hash");
  assert_eq!(*payment_failed_permanently, expected_payment_failed_permanently, "unexpected payment_failed_permanently value");
-{
+ {
  assert!(error_code.is_some(), "expected error_code.is_some() = true");
  assert!(error_data.is_some(), "expected error_data.is_some() = true");
  if let Some((code, data)) = conditions.expected_htlc_error_data {

lightning/src/ln/functional_tests.rs

@@ -2899,7 +2899,7 @@ pub fn claim_htlc_outputs() {
 //
 // This is a regression test for https://github.com/lightningdevkit/rust-lightning/issues/3537.
 #[xtest(feature = "_externalize_tests")]
-fn test_multiple_package_conflicts() {
+pub fn test_multiple_package_conflicts() {
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 	let mut user_cfg = test_default_channel_config();
@@ -5047,7 +5047,7 @@ pub fn test_static_spendable_outputs_timeout_tx() {
 	check_spends!(spend_txn[2], node_txn[0], commitment_tx[0]); // All outputs
 }
 
-pub fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
+fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
@@ -10603,7 +10603,7 @@ pub fn test_max_dust_htlc_exposure() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_nondust_htlc_excess_fees_are_dust() {
+pub fn test_nondust_htlc_excess_fees_are_dust() {
 	// Test that the excess transaction fees paid in nondust HTLCs count towards our dust limit
 	const DEFAULT_FEERATE: u32 = 253;
 	const HIGH_FEERATE: u32 = 275;
@@ -11943,7 +11943,7 @@ pub fn test_manual_funding_abandon() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_funding_signed_event() {
+pub fn test_funding_signed_event() {
 	let mut cfg = UserConfig::default();
 	cfg.channel_handshake_config.minimum_depth = 1;
 	let chanmon_cfgs = create_chanmon_cfgs(2);

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,

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/ln/functional_test_utils.rs

@@ -513,7 +513,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// Toggles this node's signer to be available for the given signer operation.
 	/// This is useful for testing behavior for restoring an async signer that previously
 	/// could not return a signature immediately.
-pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
+	pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
  self.set_channel_signer_ops(peer_id, chan_id, signer_op, true);
 	}
 
@@ -532,7 +532,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// will behave normally, returning `Ok`. When set to `false`, and the channel signer will
 	/// act like an off-line remote signer, returning `Err`. This applies to the signer in all
 	/// relevant places, i.e. the channel manager, chain monitor, and the keys manager.
-fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
+	fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
  use crate::sign::ChannelSigner;
  log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);
 
@@ -2549,11 +2549,12 @@ pub fn expect_payment_failed_conditions_event<'a, 'b, 'c, 'd, 'e>(
 	if conditions.expected_mpp_parts_remain { assert_eq!(payment_failed_events.len(), 1); } else { assert_eq!(payment_failed_events.len(), 2); }
 	let expected_payment_id = match &payment_failed_events[0] {
  Event::PaymentPathFailed { payment_hash, payment_failed_permanently, payment_id, failure,
- error_code,
- error_data, .. } => {
+ error_code,
+ error_data, ..
+ } => {
  assert_eq!(*payment_hash, expected_payment_hash, "unexpected payment_hash");
  assert_eq!(*payment_failed_permanently, expected_payment_failed_permanently, "unexpected payment_failed_permanently value");
-{
+ {
  assert!(error_code.is_some(), "expected error_code.is_some() = true");
  assert!(error_data.is_some(), "expected error_data.is_some() = true");
  if let Some((code, data)) = conditions.expected_htlc_error_data {

lightning/src/ln/functional_tests.rs

@@ -2899,7 +2899,7 @@ pub fn claim_htlc_outputs() {
 //
 // This is a regression test for https://github.com/lightningdevkit/rust-lightning/issues/3537.
 #[xtest(feature = "_externalize_tests")]
-fn test_multiple_package_conflicts() {
+pub fn test_multiple_package_conflicts() {
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 	let mut user_cfg = test_default_channel_config();
@@ -5047,7 +5047,7 @@ pub fn test_static_spendable_outputs_timeout_tx() {
 	check_spends!(spend_txn[2], node_txn[0], commitment_tx[0]); // All outputs
 }
 
-pub fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
+fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
@@ -10603,7 +10603,7 @@ pub fn test_max_dust_htlc_exposure() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_nondust_htlc_excess_fees_are_dust() {
+pub fn test_nondust_htlc_excess_fees_are_dust() {
 	// Test that the excess transaction fees paid in nondust HTLCs count towards our dust limit
 	const DEFAULT_FEERATE: u32 = 253;
 	const HIGH_FEERATE: u32 = 275;
@@ -11943,7 +11943,7 @@ pub fn test_manual_funding_abandon() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_funding_signed_event() {
+pub fn test_funding_signed_event() {
 	let mut cfg = UserConfig::default();
 	cfg.channel_handshake_config.minimum_depth = 1;
 	let chanmon_cfgs = create_chanmon_cfgs(2);

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,

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/ln/functional_test_utils.rs

@@ -513,7 +513,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// Toggles this node's signer to be available for the given signer operation.
 	/// This is useful for testing behavior for restoring an async signer that previously
 	/// could not return a signature immediately.
-pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
+	pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
  self.set_channel_signer_ops(peer_id, chan_id, signer_op, true);
 	}
 
@@ -532,7 +532,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// will behave normally, returning `Ok`. When set to `false`, and the channel signer will
 	/// act like an off-line remote signer, returning `Err`. This applies to the signer in all
 	/// relevant places, i.e. the channel manager, chain monitor, and the keys manager.
-fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
+	fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
  use crate::sign::ChannelSigner;
  log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);
 
@@ -2549,11 +2549,12 @@ pub fn expect_payment_failed_conditions_event<'a, 'b, 'c, 'd, 'e>(
 	if conditions.expected_mpp_parts_remain { assert_eq!(payment_failed_events.len(), 1); } else { assert_eq!(payment_failed_events.len(), 2); }
 	let expected_payment_id = match &payment_failed_events[0] {
  Event::PaymentPathFailed { payment_hash, payment_failed_permanently, payment_id, failure,
- error_code,
- error_data, .. } => {
+ error_code,
+ error_data, ..
+ } => {
  assert_eq!(*payment_hash, expected_payment_hash, "unexpected payment_hash");
  assert_eq!(*payment_failed_permanently, expected_payment_failed_permanently, "unexpected payment_failed_permanently value");
-{
+ {
  assert!(error_code.is_some(), "expected error_code.is_some() = true");
  assert!(error_data.is_some(), "expected error_data.is_some() = true");
  if let Some((code, data)) = conditions.expected_htlc_error_data {

lightning/src/ln/functional_tests.rs

@@ -2899,7 +2899,7 @@ pub fn claim_htlc_outputs() {
 //
 // This is a regression test for https://github.com/lightningdevkit/rust-lightning/issues/3537.
 #[xtest(feature = "_externalize_tests")]
-fn test_multiple_package_conflicts() {
+pub fn test_multiple_package_conflicts() {
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 	let mut user_cfg = test_default_channel_config();
@@ -5047,7 +5047,7 @@ pub fn test_static_spendable_outputs_timeout_tx() {
 	check_spends!(spend_txn[2], node_txn[0], commitment_tx[0]); // All outputs
 }
 
-pub fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
+fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
@@ -10603,7 +10603,7 @@ pub fn test_max_dust_htlc_exposure() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_nondust_htlc_excess_fees_are_dust() {
+pub fn test_nondust_htlc_excess_fees_are_dust() {
 	// Test that the excess transaction fees paid in nondust HTLCs count towards our dust limit
 	const DEFAULT_FEERATE: u32 = 253;
 	const HIGH_FEERATE: u32 = 275;
@@ -11943,7 +11943,7 @@ pub fn test_manual_funding_abandon() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_funding_signed_event() {
+pub fn test_funding_signed_event() {
 	let mut cfg = UserConfig::default();
 	cfg.channel_handshake_config.minimum_depth = 1;
 	let chanmon_cfgs = create_chanmon_cfgs(2);

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,

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/ln/functional_test_utils.rs

@@ -513,7 +513,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// Toggles this node's signer to be available for the given signer operation.
 	/// This is useful for testing behavior for restoring an async signer that previously
 	/// could not return a signature immediately.
-pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
+	pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
  self.set_channel_signer_ops(peer_id, chan_id, signer_op, true);
 	}
 
@@ -532,7 +532,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// will behave normally, returning `Ok`. When set to `false`, and the channel signer will
 	/// act like an off-line remote signer, returning `Err`. This applies to the signer in all
 	/// relevant places, i.e. the channel manager, chain monitor, and the keys manager.
-fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
+	fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
  use crate::sign::ChannelSigner;
  log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);
 
@@ -2549,11 +2549,12 @@ pub fn expect_payment_failed_conditions_event<'a, 'b, 'c, 'd, 'e>(
 	if conditions.expected_mpp_parts_remain { assert_eq!(payment_failed_events.len(), 1); } else { assert_eq!(payment_failed_events.len(), 2); }
 	let expected_payment_id = match &payment_failed_events[0] {
  Event::PaymentPathFailed { payment_hash, payment_failed_permanently, payment_id, failure,
- error_code,
- error_data, .. } => {
+ error_code,
+ error_data, ..
+ } => {
  assert_eq!(*payment_hash, expected_payment_hash, "unexpected payment_hash");
  assert_eq!(*payment_failed_permanently, expected_payment_failed_permanently, "unexpected payment_failed_permanently value");
-{
+ {
  assert!(error_code.is_some(), "expected error_code.is_some() = true");
  assert!(error_data.is_some(), "expected error_data.is_some() = true");
  if let Some((code, data)) = conditions.expected_htlc_error_data {

lightning/src/ln/functional_tests.rs

@@ -2899,7 +2899,7 @@ pub fn claim_htlc_outputs() {
 //
 // This is a regression test for https://github.com/lightningdevkit/rust-lightning/issues/3537.
 #[xtest(feature = "_externalize_tests")]
-fn test_multiple_package_conflicts() {
+pub fn test_multiple_package_conflicts() {
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 	let mut user_cfg = test_default_channel_config();
@@ -5047,7 +5047,7 @@ pub fn test_static_spendable_outputs_timeout_tx() {
 	check_spends!(spend_txn[2], node_txn[0], commitment_tx[0]); // All outputs
 }
 
-pub fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
+fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
@@ -10603,7 +10603,7 @@ pub fn test_max_dust_htlc_exposure() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_nondust_htlc_excess_fees_are_dust() {
+pub fn test_nondust_htlc_excess_fees_are_dust() {
 	// Test that the excess transaction fees paid in nondust HTLCs count towards our dust limit
 	const DEFAULT_FEERATE: u32 = 253;
 	const HIGH_FEERATE: u32 = 275;
@@ -11943,7 +11943,7 @@ pub fn test_manual_funding_abandon() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_funding_signed_event() {
+pub fn test_funding_signed_event() {
 	let mut cfg = UserConfig::default();
 	cfg.channel_handshake_config.minimum_depth = 1;
 	let chanmon_cfgs = create_chanmon_cfgs(2);

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,

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/ln/functional_test_utils.rs

@@ -513,7 +513,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// Toggles this node's signer to be available for the given signer operation.
 	/// This is useful for testing behavior for restoring an async signer that previously
 	/// could not return a signature immediately.
-pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
+	pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
  self.set_channel_signer_ops(peer_id, chan_id, signer_op, true);
 	}
 
@@ -532,7 +532,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// will behave normally, returning `Ok`. When set to `false`, and the channel signer will
 	/// act like an off-line remote signer, returning `Err`. This applies to the signer in all
 	/// relevant places, i.e. the channel manager, chain monitor, and the keys manager.
-fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
+	fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
  use crate::sign::ChannelSigner;
  log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);
 
@@ -2549,11 +2549,12 @@ pub fn expect_payment_failed_conditions_event<'a, 'b, 'c, 'd, 'e>(
 	if conditions.expected_mpp_parts_remain { assert_eq!(payment_failed_events.len(), 1); } else { assert_eq!(payment_failed_events.len(), 2); }
 	let expected_payment_id = match &payment_failed_events[0] {
  Event::PaymentPathFailed { payment_hash, payment_failed_permanently, payment_id, failure,
- error_code,
- error_data, .. } => {
+ error_code,
+ error_data, ..
+ } => {
  assert_eq!(*payment_hash, expected_payment_hash, "unexpected payment_hash");
  assert_eq!(*payment_failed_permanently, expected_payment_failed_permanently, "unexpected payment_failed_permanently value");
-{
+ {
  assert!(error_code.is_some(), "expected error_code.is_some() = true");
  assert!(error_data.is_some(), "expected error_data.is_some() = true");
  if let Some((code, data)) = conditions.expected_htlc_error_data {

lightning/src/ln/functional_tests.rs

@@ -2899,7 +2899,7 @@ pub fn claim_htlc_outputs() {
 //
 // This is a regression test for https://github.com/lightningdevkit/rust-lightning/issues/3537.
 #[xtest(feature = "_externalize_tests")]
-fn test_multiple_package_conflicts() {
+pub fn test_multiple_package_conflicts() {
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 	let mut user_cfg = test_default_channel_config();
@@ -5047,7 +5047,7 @@ pub fn test_static_spendable_outputs_timeout_tx() {
 	check_spends!(spend_txn[2], node_txn[0], commitment_tx[0]); // All outputs
 }
 
-pub fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
+fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
@@ -10603,7 +10603,7 @@ pub fn test_max_dust_htlc_exposure() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_nondust_htlc_excess_fees_are_dust() {
+pub fn test_nondust_htlc_excess_fees_are_dust() {
 	// Test that the excess transaction fees paid in nondust HTLCs count towards our dust limit
 	const DEFAULT_FEERATE: u32 = 253;
 	const HIGH_FEERATE: u32 = 275;
@@ -11943,7 +11943,7 @@ pub fn test_manual_funding_abandon() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_funding_signed_event() {
+pub fn test_funding_signed_event() {
 	let mut cfg = UserConfig::default();
 	cfg.channel_handshake_config.minimum_depth = 1;
 	let chanmon_cfgs = create_chanmon_cfgs(2);

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,

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/ln/functional_test_utils.rs

@@ -513,7 +513,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// Toggles this node's signer to be available for the given signer operation.
 	/// This is useful for testing behavior for restoring an async signer that previously
 	/// could not return a signature immediately.
-pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
+	pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
  self.set_channel_signer_ops(peer_id, chan_id, signer_op, true);
 	}
 
@@ -532,7 +532,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// will behave normally, returning `Ok`. When set to `false`, and the channel signer will
 	/// act like an off-line remote signer, returning `Err`. This applies to the signer in all
 	/// relevant places, i.e. the channel manager, chain monitor, and the keys manager.
-fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
+	fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
  use crate::sign::ChannelSigner;
  log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);
 
@@ -2549,11 +2549,12 @@ pub fn expect_payment_failed_conditions_event<'a, 'b, 'c, 'd, 'e>(
 	if conditions.expected_mpp_parts_remain { assert_eq!(payment_failed_events.len(), 1); } else { assert_eq!(payment_failed_events.len(), 2); }
 	let expected_payment_id = match &payment_failed_events[0] {
  Event::PaymentPathFailed { payment_hash, payment_failed_permanently, payment_id, failure,
- error_code,
- error_data, .. } => {
+ error_code,
+ error_data, ..
+ } => {
  assert_eq!(*payment_hash, expected_payment_hash, "unexpected payment_hash");
  assert_eq!(*payment_failed_permanently, expected_payment_failed_permanently, "unexpected payment_failed_permanently value");
-{
+ {
  assert!(error_code.is_some(), "expected error_code.is_some() = true");
  assert!(error_data.is_some(), "expected error_data.is_some() = true");
  if let Some((code, data)) = conditions.expected_htlc_error_data {

lightning/src/ln/functional_tests.rs

@@ -2899,7 +2899,7 @@ pub fn claim_htlc_outputs() {
 //
 // This is a regression test for https://github.com/lightningdevkit/rust-lightning/issues/3537.
 #[xtest(feature = "_externalize_tests")]
-fn test_multiple_package_conflicts() {
+pub fn test_multiple_package_conflicts() {
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 	let mut user_cfg = test_default_channel_config();
@@ -5047,7 +5047,7 @@ pub fn test_static_spendable_outputs_timeout_tx() {
 	check_spends!(spend_txn[2], node_txn[0], commitment_tx[0]); // All outputs
 }
 
-pub fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
+fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
@@ -10603,7 +10603,7 @@ pub fn test_max_dust_htlc_exposure() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_nondust_htlc_excess_fees_are_dust() {
+pub fn test_nondust_htlc_excess_fees_are_dust() {
 	// Test that the excess transaction fees paid in nondust HTLCs count towards our dust limit
 	const DEFAULT_FEERATE: u32 = 253;
 	const HIGH_FEERATE: u32 = 275;
@@ -11943,7 +11943,7 @@ pub fn test_manual_funding_abandon() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_funding_signed_event() {
+pub fn test_funding_signed_event() {
 	let mut cfg = UserConfig::default();
 	cfg.channel_handshake_config.minimum_depth = 1;
 	let chanmon_cfgs = create_chanmon_cfgs(2);

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,

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/ln/functional_test_utils.rs

@@ -513,7 +513,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// Toggles this node's signer to be available for the given signer operation.
 	/// This is useful for testing behavior for restoring an async signer that previously
 	/// could not return a signature immediately.
-pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
+	pub fn enable_channel_signer_op(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp) {
  self.set_channel_signer_ops(peer_id, chan_id, signer_op, true);
 	}
 
@@ -532,7 +532,7 @@ impl<'a, 'b, 'c> Node<'a, 'b, 'c> {
 	/// will behave normally, returning `Ok`. When set to `false`, and the channel signer will
 	/// act like an off-line remote signer, returning `Err`. This applies to the signer in all
 	/// relevant places, i.e. the channel manager, chain monitor, and the keys manager.
-fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
+	fn set_channel_signer_ops(&self, peer_id: &PublicKey, chan_id: &ChannelId, signer_op: SignerOp, available: bool) {
  use crate::sign::ChannelSigner;
  log_debug!(self.logger, "Setting channel signer for {} as available={}", chan_id, available);
 
@@ -2549,11 +2549,12 @@ pub fn expect_payment_failed_conditions_event<'a, 'b, 'c, 'd, 'e>(
 	if conditions.expected_mpp_parts_remain { assert_eq!(payment_failed_events.len(), 1); } else { assert_eq!(payment_failed_events.len(), 2); }
 	let expected_payment_id = match &payment_failed_events[0] {
  Event::PaymentPathFailed { payment_hash, payment_failed_permanently, payment_id, failure,
- error_code,
- error_data, .. } => {
+ error_code,
+ error_data, ..
+ } => {
  assert_eq!(*payment_hash, expected_payment_hash, "unexpected payment_hash");
  assert_eq!(*payment_failed_permanently, expected_payment_failed_permanently, "unexpected payment_failed_permanently value");
-{
+ {
  assert!(error_code.is_some(), "expected error_code.is_some() = true");
  assert!(error_data.is_some(), "expected error_data.is_some() = true");
  if let Some((code, data)) = conditions.expected_htlc_error_data {

lightning/src/ln/functional_tests.rs

@@ -2899,7 +2899,7 @@ pub fn claim_htlc_outputs() {
 //
 // This is a regression test for https://github.com/lightningdevkit/rust-lightning/issues/3537.
 #[xtest(feature = "_externalize_tests")]
-fn test_multiple_package_conflicts() {
+pub fn test_multiple_package_conflicts() {
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
 	let mut user_cfg = test_default_channel_config();
@@ -5047,7 +5047,7 @@ pub fn test_static_spendable_outputs_timeout_tx() {
 	check_spends!(spend_txn[2], node_txn[0], commitment_tx[0]); // All outputs
 }
 
-pub fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
+fn do_test_static_spendable_outputs_justice_tx_revoked_commitment_tx(split_tx: bool) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
@@ -10603,7 +10603,7 @@ pub fn test_max_dust_htlc_exposure() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_nondust_htlc_excess_fees_are_dust() {
+pub fn test_nondust_htlc_excess_fees_are_dust() {
 	// Test that the excess transaction fees paid in nondust HTLCs count towards our dust limit
 	const DEFAULT_FEERATE: u32 = 253;
 	const HIGH_FEERATE: u32 = 275;
@@ -11943,7 +11943,7 @@ pub fn test_manual_funding_abandon() {
 }
 
 #[xtest(feature = "_externalize_tests")]
-fn test_funding_signed_event() {
+pub fn test_funding_signed_event() {
 	let mut cfg = UserConfig::default();
 	cfg.channel_handshake_config.minimum_depth = 1;
 	let chanmon_cfgs = create_chanmon_cfgs(2);

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,