f Improve and clarify comments

Author: wvanlint

lightning/src/chain/channelmonitor.rs

@@ -224,7 +224,9 @@ pub(crate) const COUNTERPARTY_CLAIMABLE_WITHIN_BLOCKS_PINNABLE: u32 = 12;
 /// When we go to force-close a channel because an HTLC is expiring, we should ensure that the
 /// HTLC(s) expiring are not considered pinnable, allowing us to aggregate them with other HTLC(s)
 /// expiring at the same time.
-const _HTLCS_NOT_PINNABLE_ON_CLOSE: u32 = CLTV_CLAIM_BUFFER - COUNTERPARTY_CLAIMABLE_WITHIN_BLOCKS_PINNABLE;
+///
+/// This is verified here at compile-time by ensuring the difference is positive.
+const _ASSERT_HTLCS_NOT_PINNABLE_ON_CLOSE: u32 = CLTV_CLAIM_BUFFER - COUNTERPARTY_CLAIMABLE_WITHIN_BLOCKS_PINNABLE;
 
 /// If an HTLC expires within this many blocks, force-close the channel to broadcast the
 /// HTLC-Success transaction.

lightning/src/chain/package.rs

@@ -798,7 +798,7 @@ impl PackageTemplate {
 					return false;
 				}
 
-				// First check the types of the inputs and only merge if they are possibly claiming
+				// First check the types of the inputs and don't merge if they are possibly claiming
 				// from different commitment transactions at the same time.
 				// This shouldn't ever happen, but if we do end up with packages trying to claim
 				// funds from two different commitment transactions (which cannot possibly be
@@ -831,7 +831,7 @@ impl PackageTemplate {
 					return false;
 				}
 
-				// Now check that we only merge packages if we they are both unpinnable or both
+				// Now check that we only merge packages if they are both unpinnable or both
 				// pinnable.
 				let self_pinnable = self_cluster == AggregationCluster::Pinnable ||
 					self.counterparty_spendable_height() <= cur_height + COUNTERPARTY_CLAIMABLE_WITHIN_BLOCKS_PINNABLE;