From: Matt Corallo <git@bluematt.me>
Date: Wed, 4 Mar 2020 22:53:16 +0000 (-0500)
Subject: Correct comment in onchaintx.rs
X-Git-Tag: v0.0.12~109^2~2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=9de9288100408196955b19081844d57e593af228;p=rust-lightning

Correct comment in onchaintx.rs

This comment was stale and referred to a previous implementation
of #462, which changed before it was merged.
---

diff --git a/lightning/src/ln/onchaintx.rs b/lightning/src/ln/onchaintx.rs
index c731bc079..e456b7164 100644
--- a/lightning/src/ln/onchaintx.rs
+++ b/lightning/src/ln/onchaintx.rs
@@ -487,8 +487,8 @@ impl OnchainTxHandler {
 		let mut aggregated_soonest = ::std::u32::MAX;
 		let mut spendable_outputs = Vec::new();
 
-		// Try to aggregate outputs if they're 1) belong to same parent tx, 2) their
-		// timelock expiration isn't imminent (<= CLTV_SHARED_CLAIM_BUFFER).
+		// Try to aggregate outputs if their timelock expiration isn't imminent (absolute_timelock
+		// <= CLTV_SHARED_CLAIM_BUFFER) and they don't require an immediate nLockTime (aggregable).
 		for req in claimable_outpoints {
 			// Don't claim a outpoint twice that would be bad for privacy and may uselessly lock a CPFP input for a while
 			if let Some(_) = self.claimable_outpoints.get(&req.outpoint) { log_trace!(self, "Bouncing off outpoint {}:{}, already registered its claiming request", req.outpoint.txid, req.outpoint.vout); } else {