f Improve docs, merge some variants

Author: tnull

lightning/src/chain/chaininterface.rs

@@ -33,32 +33,30 @@ pub enum TransactionType {
 		/// A single funding transaction may establish multiple channels when using batch funding.
 		channel_ids: Vec<ChannelId>,
 	},
-	/// A cooperative close transaction mutually agreed upon by both parties.
+	/// A transaction cooperatively closing a channel.
 	CooperativeClose {
 		/// The ID of the channel being closed.
 		channel_id: ChannelId,
 	},
-	/// A commitment transaction being broadcast to force-close the channel.
-	Commitment {
+	/// A transaction being broadcast to force-close the channel.
+	UnilateralClose {
 		/// The ID of the channel being force-closed.
 		channel_id: ChannelId,
 	},
-	/// An anchor transaction used for CPFP fee-bumping a commitment transaction.
-	Anchor {
-		/// The ID of the channel whose commitment transaction is being fee-bumped.
+	/// An anchor bumping transaction used for CPFP fee-bumping a closing transaction.
+	AnchorBump {
+		/// The ID of the channel whose closing transaction is being fee-bumped.
 		channel_id: ChannelId,
 	},
 	/// A transaction claiming outputs from a commitment transaction (HTLC claims, penalty/justice).
 	Claim {
 		/// The ID of the channel from which outputs are being claimed.
 		channel_id: ChannelId,
 	},
-	/// An HTLC resolution transaction (HTLC-timeout or HTLC-success) for anchor channels.
-	HtlcResolution {
-		/// The ID of the channel whose HTLCs are being resolved.
-		channel_id: ChannelId,
-	},
-	/// A transaction sweeping spendable outputs to the user's wallet.
+	/// A transaction genered by the [`OutputSweeper`], sweeping [`SpendableOutputDescriptor`]s to the user's wallet.
+	///
+	/// [`OutputSweeper`]: crate::util::sweep::OutputSweeper
+	/// [`SpendableOutputDescriptor`]: crate::sign::SpendableOutputDescriptor
 	Sweep {
 		/// The IDs of the channels from which outputs are being swept, if known.
 		///

lightning/src/events/bump_transaction/mod.rs

@@ -790,7 +790,7 @@ where
 				package_target_feerate_sat_per_1000_weight);
 			self.broadcaster.broadcast_transactions(&[(
 				&commitment_tx,
-				TransactionType::Commitment { channel_id },
+				TransactionType::UnilateralClose { channel_id },
 			)]);
 			return Ok(());
 		}
@@ -959,8 +959,8 @@ where
 				commitment_tx.compute_txid()
 			);
 			self.broadcaster.broadcast_transactions(&[
-				(&commitment_tx, TransactionType::Commitment { channel_id }),
-				(&anchor_tx, TransactionType::Anchor { channel_id }),
+				(&commitment_tx, TransactionType::UnilateralClose { channel_id }),
+				(&anchor_tx, TransactionType::AnchorBump { channel_id }),
 			]);
 			return Ok(());
 		}
@@ -1196,7 +1196,7 @@ where
 			log_info!(self.logger, "Broadcasting {}", log_tx!(htlc_tx));
 			self.broadcaster.broadcast_transactions(&[(
 				&htlc_tx,
-				TransactionType::HtlcResolution { channel_id },
+				TransactionType::UnilateralClose { channel_id },
 			)]);
 		}