f: trim a few more nits

Author: tankyleo

lightning/src/ln/htlc_reserve_unit_tests.rs

@@ -20,11 +20,10 @@ use crate::routing::router::PaymentParameters;
 use crate::sign::ecdsa::EcdsaChannelSigner;
 use crate::sign::tx_builder::{SpecTxBuilder, TxBuilder};
 use crate::types::features::ChannelTypeFeatures;
-use crate::types::payment::PaymentPreimage;
+use crate::types::payment::{PaymentHash, PaymentPreimage};
 use crate::util::config::UserConfig;
 use crate::util::errors::APIError;
 
-use bolt11_invoice::PaymentHash;
 use lightning_macros::xtest;
 
 use bitcoin::secp256k1::{Secp256k1, SecretKey};
@@ -2443,7 +2442,7 @@ pub fn do_test_dust_limit_fee_accounting(can_afford: bool) {
 	}
 }
 
-#[test]
+#[xtest(feature = "_externalize_tests")]
 fn test_create_channel_to_trusted_peer_0reserve() {
 	let mut config = test_default_channel_config();
 
@@ -2466,7 +2465,6 @@ fn test_create_channel_to_trusted_peer_0reserve() {
 	assert_eq!(channel_type, ChannelTypeFeatures::anchors_zero_fee_commitments());
 }
 
-#[cfg(test)]
 fn do_test_create_channel_to_trusted_peer_0reserve(mut config: UserConfig) -> ChannelTypeFeatures {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
@@ -2530,7 +2528,7 @@ fn do_test_create_channel_to_trusted_peer_0reserve(mut config: UserConfig) -> Ch
 	channel_type
 }
 
-#[test]
+#[xtest(feature = "_externalize_tests")]
 fn test_accept_inbound_channel_from_trusted_peer_0reserve() {
 	let mut config = test_default_channel_config();
 
@@ -2553,7 +2551,6 @@ fn test_accept_inbound_channel_from_trusted_peer_0reserve() {
 	assert_eq!(channel_type, ChannelTypeFeatures::anchors_zero_fee_commitments());
 }
 
-#[cfg(test)]
 fn do_test_accept_inbound_channel_from_trusted_peer_0reserve(
 	mut config: UserConfig,
 ) -> ChannelTypeFeatures {
@@ -2656,7 +2653,7 @@ enum LegacyChannelsNoOutputs {
 	FailsReceiverCanAcceptHTLCB,
 }
 
-#[test]
+#[xtest(feature = "_externalize_tests")]
 fn test_zero_reserve_no_outputs() {
 	do_test_zero_reserve_no_outputs_legacy(LegacyChannelsNoOutputs::PaymentSucceeds);
 	do_test_zero_reserve_no_outputs_legacy(LegacyChannelsNoOutputs::FailsReceiverCanAcceptHTLCA);
@@ -2773,7 +2770,6 @@ fn do_test_zero_reserve_no_outputs_legacy(no_outputs_case: LegacyChannelsNoOutpu
 
 	let feerate_per_kw = 253;
 	let spike_multiple = FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE as u32;
-	let anchors_sat = 0;
 	let dust_limit_satoshis: u64 = 546;
 	// This is the fundee 1000sat reserve + 2 min HTLCs
 	let channel_value_sat = 1002;
@@ -2788,7 +2784,6 @@ fn do_test_zero_reserve_no_outputs_legacy(no_outputs_case: LegacyChannelsNoOutpu
 	let max_dust_htlc_sat = dust_limit_satoshis + success_tx_fee_sat - 1;
 	assert!(
 		channel_value_sat
-			.saturating_sub(anchors_sat)
 			.saturating_sub(commit_tx_fee_sat(feerate_per_kw, 0, &channel_type))
 			.saturating_sub(max_dust_htlc_sat)
 			< dust_limit_satoshis
@@ -3220,7 +3215,6 @@ fn do_test_zero_reserve_no_outputs_p2a_anchor() {
 	let _node_b_id = nodes[1].node.get_our_node_id();
 
 	let feerate_per_kw = 253;
-	let anchors_sat = 0;
 	let dust_limit_satoshis: u64 = 546;
 	// This is the fundee 1000sat reserve + 2 min HTLCs
 	let channel_value_sat = 1002;
@@ -3233,7 +3227,6 @@ fn do_test_zero_reserve_no_outputs_p2a_anchor() {
 	let max_dust_htlc_sat = dust_limit_satoshis - 1;
 	assert!(
 		channel_value_sat
-			.saturating_sub(anchors_sat)
 			.saturating_sub(commit_tx_fee_sat(feerate_per_kw, 0, &channel_type))
 			.saturating_sub(max_dust_htlc_sat)
 			< dust_limit_satoshis
@@ -3251,12 +3244,11 @@ fn do_test_zero_reserve_no_outputs_p2a_anchor() {
 
 	send_payment(&nodes[0], &[&nodes[1]], sender_amount_msat);
 	// Node 1 the fundee has 0-reserve too, so whatever they receive, they can send right back!
-	// Node 0 should *always* have the funds to cover the fee of a single non-dust HTLC from node 1.
 	assert_eq!(nodes[1].node.list_channels()[0].next_outbound_htlc_limit_msat, sender_amount_msat);
 	send_payment(&nodes[1], &[&nodes[0]], sender_amount_msat);
 }
 
-#[test]
+#[xtest(feature = "_externalize_tests")]
 fn test_zero_reserve_zero_conf_combined() {
 	// Test that zero-reserve and zero-conf features work together: a channel that
 	// is immediately usable (no confirmations needed) and has zero reserve for the opener.