From abee659e41330cb567c7c3f8be2e78820839be02 Mon Sep 17 00:00:00 2001 From: Devrandom Date: Tue, 4 Mar 2025 18:38:54 +0100 Subject: [PATCH] Fix nits from #3016 --- lightning/src/ln/channelmanager.rs | 1 - lightning/src/ln/functional_test_utils.rs | 6 +++--- lightning/src/ln/functional_tests.rs | 10 +++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs index 3771e3fc959..54683a898ec 100644 --- a/lightning/src/ln/channelmanager.rs +++ b/lightning/src/ln/channelmanager.rs @@ -4670,7 +4670,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 diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs index 67470b0ce45..c56f3fc5f8f 100644 --- a/lightning/src/ln/functional_test_utils.rs +++ b/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); } @@ -2549,8 +2549,8 @@ 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"); { diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs index 91c67c7e426..5a3d38eb235 100644 --- a/lightning/src/ln/functional_tests.rs +++ b/lightning/src/ln/functional_tests.rs @@ -66,7 +66,7 @@ use crate::ln::chan_utils::CommitmentTransaction; use super::channel::UNFUNDED_CHANNEL_AGE_LIMIT_TICKS; #[xtest(feature = "_externalize_tests")] -fn test_channel_resumption_fail_post_funding() { +pub fn test_channel_resumption_fail_post_funding() { // If we fail to exchange funding with a peer prior to it disconnecting we'll resume the // channel open on reconnect, however if we do exchange funding we do not currently support // replaying it and here test that the channel closes. @@ -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);