Merge pull request #3634 from TheBlueMatt/2025-03-meth-field-alias

Rename `SpendableOutputDescriptor::outpoint()`
lightningdevkit · Mar 3, 2025 · 47cb737 · 47cb737
2 parents 36ba27a + 74018b0
commit 47cb737
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lightning/src/sign/mod.rs b/lightning/src/sign/mod.rs
@@ -534,7 +534,7 @@ impl SpendableOutputDescriptor {
 	}
 
 	/// Returns the outpoint of the spendable output.
-	pub fn outpoint(&self) -> OutPoint {
+	pub fn spendable_outpoint(&self) -> OutPoint {
 		match self {
 			Self::StaticOutput { outpoint, .. } => *outpoint,
 			Self::StaticPaymentOutput(descriptor) => descriptor.outpoint,

diff --git a/lightning/src/util/sweep.rs b/lightning/src/util/sweep.rs
@@ -74,7 +74,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 = self.descriptor.outpoint().into_bitcoin_outpoint();
+		let prev_outpoint = self.descriptor.spendable_outpoint().into_bitcoin_outpoint();
 		tx.input.iter().any(|input| input.previous_output == prev_outpoint)
 	}
 }