From af43a863cbd44f9590de103431fc28a7c952ed02 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Tue, 6 Jul 2021 16:37:20 -0700
Subject: [PATCH] lnwallet: ensure MayAddOutgoingHtlc doesn't add zero-value
 HTLCs

In this commit, in order to allow the test added in the prior commit to
pass, we'll increment the mockHTLCAmt value by 1 to ensure we never
attempt to add a zero value HTLC.

Fixes #5468
---
 lnwallet/channel.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lnwallet/channel.go b/lnwallet/channel.go
index 1301d83f..56991bd3 100644
--- a/lnwallet/channel.go
+++ b/lnwallet/channel.go
@@ -4940,13 +4940,22 @@ func (lc *LightningChannel) MayAddOutgoingHtlc() error {
 	lc.Lock()
 	defer lc.Unlock()
 
+	// As this is a mock HTLC, we'll attempt to add the smallest possible
+	// HTLC permitted in the channel. However certain implementations may
+	// set this value to zero, so we'll catch that and increment things so
+	// we always use a non-zero value.
+	mockHtlcAmt := lc.channelState.LocalChanCfg.MinHTLC
+	if mockHtlcAmt == 0 {
+		mockHtlcAmt++
+	}
+
 	// Create a "mock" outgoing htlc, using the smallest amount we can add
 	// to the commitment so that we validate commitment slots rather than
 	// available balance, since our actual htlc amount is unknown at this
 	// stage.
 	pd := lc.htlcAddDescriptor(
 		&lnwire.UpdateAddHTLC{
-			Amount: lc.channelState.LocalChanCfg.MinHTLC,
+			Amount: mockHtlcAmt,
 		},
 		&channeldb.CircuitKey{},
 	)