loopd: return full CSV value for unconfirmed deposit expiry

Unconfirmed deposits still have the full CSV window ahead of them, so
depositBlocksUntilExpiry should return the full expiry value rather than
0, which would misleadingly suggest the deposit is about to expire.

Author: hieblmi

loopd/swapclient_server.go

@@ -2162,12 +2162,13 @@ func (s *swapClientServer) populateBlocksUntilExpiry(ctx context.Context,
 }
 
 // depositBlocksUntilExpiry returns the remaining blocks until a deposit
-// expires. Unconfirmed deposits return 0 because the CSV has not started yet.
+// expires. Unconfirmed deposits return the full CSV value because the timeout
+// has not started yet.
 func depositBlocksUntilExpiry(confirmationHeight int64, expiry uint32,
 	bestBlockHeight int64) int64 {
 
 	if confirmationHeight <= 0 {
-		return 0
+		return int64(expiry)
 	}
 
 	return confirmationHeight + int64(expiry) - bestBlockHeight

loopd/swapclient_server_deposit_test.go

@@ -6,8 +6,8 @@ import "testing"
 // confirmed and unconfirmed deposits.
 func TestDepositBlocksUntilExpiry(t *testing.T) {
 	t.Run("unconfirmed", func(t *testing.T) {
-		if blocks := depositBlocksUntilExpiry(0, 144, 500); blocks != 0 {
-			t.Fatalf("expected 0 blocks for unconfirmed deposit, got %d",
+		if blocks := depositBlocksUntilExpiry(0, 144, 500); blocks != 144 {
+			t.Fatalf("expected 144 blocks for unconfirmed deposit, got %d",
 				blocks)
 		}
 	})