f use OutputSpendingFee

Author: TheBlueMatt

lightning/src/chain/chaininterface.rs

@@ -62,9 +62,6 @@ pub enum ConfirmationTarget {
 	/// on-chain (it doesn't have to happen in the next few blocks!), but we shouldn't risk too low
 	/// a fee - this should be a relatively high priority feerate.
 	UrgentOnChainSweep,
-	/// We have some funds available on chain which we need to spend but have no particular urgency
-	/// to do so.
-	NonUrgentOnChainSweep,
 	/// This is the lowest feerate we will allow our channel counterparty to have in an anchor
 	/// channel in order to close the channel if a channel party goes away.
 	///
@@ -135,8 +132,11 @@ pub enum ConfirmationTarget {
 	///
 	/// [`ChannelManager::close_channel_with_feerate_and_script`]: crate::ln::channelmanager::ChannelManager::close_channel_with_feerate_and_script
 	ChannelCloseMinimum,
-	/// The feerate [`OutputSweeper`] will use on transactions spending
-	/// [`SpendableOutputDescriptor`]s after a channel closure.
+	/// The feerate used to claim on-chain funds when there is no particular urgency to do so.
+	///
+	/// It is used to get commitment transactions without any HTLCs confirmed in [`ChannelMonitor`]
+	/// and by  [`OutputSweeper`] on transactions spending [`SpendableOutputDescriptor`]s after a
+	/// channel closure.
 	///
 	/// Generally spending these outputs is safe as long as they eventually confirm, so a value
 	/// (slightly above) the mempool minimum should suffice. However, as this value will influence

lightning/src/chain/channelmonitor.rs

@@ -2707,7 +2707,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 				return ConfirmationTarget::UrgentOnChainSweep;
 			}
 		}
-		ConfirmationTarget::NonUrgentOnChainSweep
+		ConfirmationTarget::OutputSpendingFee
 	}
 
 	/// Inserts a revocation secret into this channel monitor. Prunes old preimages if neither