Skip to content

Commit 54a945b

Browse files
authored
Merge pull request #3635 from TheBlueMatt/2024-12-0.1-bindings
[0.1-bindings] Rename `SpendableOutputDescriptor::outpoint()`
2 parents 929f8cf + c7200fa commit 54a945b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lightning/src/sign/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ impl SpendableOutputDescriptor {
540540
}
541541

542542
/// Returns the outpoint of the spendable output.
543-
pub fn outpoint(&self) -> OutPoint {
543+
pub fn spendable_outpoint(&self) -> OutPoint {
544544
match self {
545545
Self::StaticOutput { outpoint, .. } => *outpoint,
546546
Self::StaticPaymentOutput(descriptor) => descriptor.outpoint,

lightning/src/util/sweep.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ impl TrackedSpendableOutput {
7474

7575
/// Returns whether the output is spent in the given transaction.
7676
pub fn is_spent_in(&self, tx: &Transaction) -> bool {
77-
let prev_outpoint = self.descriptor.outpoint().into_bitcoin_outpoint();
77+
let prev_outpoint = self.descriptor.spendable_outpoint().into_bitcoin_outpoint();
7878
tx.input.iter().any(|input| input.previous_output == prev_outpoint)
7979
}
8080
}

0 commit comments

Comments
 (0)