Introduce SpendableOutputDescriptor::outpoint accessor

Author: tnull

lightning/src/sign/mod.rs

@@ -538,6 +538,15 @@ impl SpendableOutputDescriptor {
 		};
 		Ok((psbt, expected_max_weight))
 	}
+
+	/// Returns the outpoint of the spendable output.
+	pub fn outpoint(&self) -> OutPoint {
+		match self {
+			Self::StaticOutput { outpoint, .. } => *outpoint,
+			Self::StaticPaymentOutput(descriptor) => descriptor.outpoint,
+			Self::DelayedPaymentOutput(descriptor) => descriptor.outpoint,
+		}
+	}
 }
 
 /// The parameters required to derive a channel signer via [`SignerProvider`].

lightning/src/util/sweep.rs

@@ -71,13 +71,7 @@ impl TrackedSpendableOutput {
 
 	/// Returns whether the output is spent in the given transaction.
 	pub fn is_spent_in(&self, tx: &Transaction) -> bool {
-		let prev_outpoint = match &self.descriptor {
-			SpendableOutputDescriptor::StaticOutput { outpoint, .. } => *outpoint,
-			SpendableOutputDescriptor::DelayedPaymentOutput(output) => output.outpoint,
-			SpendableOutputDescriptor::StaticPaymentOutput(output) => output.outpoint,
-		}
-		.into_bitcoin_outpoint();
-
+		let prev_outpoint = self.descriptor.outpoint().into_bitcoin_outpoint();
 		tx.input.iter().any(|input| input.previous_output == prev_outpoint)
 	}
 }