From: Matt Corallo <git@bluematt.me>
Date: Mon, 16 Aug 2021 18:02:59 +0000 (+0000)
Subject: Add further comments around fee update handling in channel
X-Git-Tag: v0.0.101~24^2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=refs%2Fheads%2F2021-08-985-followups;p=rust-lightning

Add further comments around fee update handling in channel

These were suggested to clarify behavior in post-merge review of #985.
---

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 777837757..f8cbc26a2 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -3705,6 +3705,8 @@ impl<Signer: Sign> Channel<Signer> {
 		// more dust balance if the feerate increases when we have several HTLCs pending
 		// which are near the dust limit.
 		let mut feerate_per_kw = self.feerate_per_kw;
+		// If there's a pending update fee, use it to ensure we aren't under-estimating
+		// potential feerate updates coming soon.
 		if let Some((feerate, _)) = self.pending_update_fee {
 			feerate_per_kw = cmp::max(feerate_per_kw, feerate);
 		}
@@ -4941,9 +4943,10 @@ impl<Signer: Sign> Writeable for Channel<Signer> {
 		if self.is_outbound() {
 			self.pending_update_fee.map(|(a, _)| a).write(writer)?;
 		} else if let Some((feerate, FeeUpdateState::AwaitingRemoteRevokeToAnnounce)) = self.pending_update_fee {
-			// As for inbound HTLCs, if the update was only announced and never committed, drop it.
 			Some(feerate).write(writer)?;
 		} else {
+			// As for inbound HTLCs, if the update was only announced and never committed in a
+			// commitment_signed, drop it.
 			None::<u32>.write(writer)?;
 		}
 		self.holding_cell_update_fee.write(writer)?;