From f78cafca7ea0200769f7ed8adc152f2bca83e049 Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Thu, 30 Jan 2025 17:25:08 +0100
Subject: [PATCH] multi: fix CI for minor release branch

This commit fixes a couple of issues that only occur on the branch we
use for minor releases. The branch doesn't contain all refactors and
cleanups so a couple of very minor things need to be fixed.
Because we don't have all new features of the master branch we also
can't apply the fuzz corpora for the master branch as that can lead to
false positives.
---
 .github/workflows/main.yml         | 9 ---------
 cmd/commands/walletrpc_active.go   | 1 +
 go.mod                             | 3 ---
 itest/lnd_invoice_acceptor_test.go | 9 +++++----
 routing/payment_lifecycle.go       | 2 +-
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b9dc6d394..4649e0b1e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -198,15 +198,6 @@ jobs:
         if: github.event_name == 'pull_request'
         uses: ./.github/actions/rebase
 
-      - name: git checkout fuzzing seeds
-        uses: actions/checkout@v3
-        with:
-          repository: lightninglabs/lnd-fuzz
-          path: lnd-fuzz
-
-      - name: rsync fuzzing seeds
-        run: rsync -a --ignore-existing lnd-fuzz/ ./
-
       - name: setup go ${{ env.GO_VERSION }}
         uses: ./.github/actions/setup-go
         with:
diff --git a/cmd/commands/walletrpc_active.go b/cmd/commands/walletrpc_active.go
index f4b7039a8..b9a196722 100644
--- a/cmd/commands/walletrpc_active.go
+++ b/cmd/commands/walletrpc_active.go
@@ -532,6 +532,7 @@ func bumpForceCloseFee(ctx *cli.Context) error {
 
 	for _, sweep := range sweeps.PendingSweeps {
 		// Only bump anchor sweeps.
+		//nolint:lll
 		if sweep.WitnessType != walletrpc.WitnessType_COMMITMENT_ANCHOR {
 			continue
 		}
diff --git a/go.mod b/go.mod
index 0063df4b9..f011a239f 100644
--- a/go.mod
+++ b/go.mod
@@ -211,9 +211,6 @@ replace github.com/lightningnetwork/lnd/sqldb => ./sqldb
 // allows us to specify that as an option.
 replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
 
-// Temporary replace until the next version of sqldb is taged.
-replace github.com/lightningnetwork/lnd/sqldb => ./sqldb
-
 // If you change this please also update .github/pull_request_template.md,
 // docs/INSTALL.md and GO_IMAGE in lnrpc/gen_protos_docker.sh.
 go 1.22.6
diff --git a/itest/lnd_invoice_acceptor_test.go b/itest/lnd_invoice_acceptor_test.go
index c90ede9ce..679e3b631 100644
--- a/itest/lnd_invoice_acceptor_test.go
+++ b/itest/lnd_invoice_acceptor_test.go
@@ -34,6 +34,11 @@ func testInvoiceHtlcModifierBasic(ht *lntest.HarnessTest) {
 	resp := ht.OpenMultiChannelsAsync(reqs)
 	cpAB, cpBC := resp[0], resp[1]
 
+	ht.Cleanup(func() {
+		ht.CloseChannel(alice, cpAB)
+		ht.CloseChannel(bob, cpBC)
+	})
+
 	// Make sure Alice is aware of channel Bob=>Carol.
 	ht.AssertTopologyChannelOpen(alice, cpBC)
 
@@ -214,10 +219,6 @@ func testInvoiceHtlcModifierBasic(ht *lntest.HarnessTest) {
 	}
 
 	cancelModifier()
-
-	// Finally, close channels.
-	ht.CloseChannel(alice, cpAB)
-	ht.CloseChannel(bob, cpBC)
 }
 
 // acceptorTestCase is a helper struct to hold test case data.
diff --git a/routing/payment_lifecycle.go b/routing/payment_lifecycle.go
index 5e72beb87..52e2f382a 100644
--- a/routing/payment_lifecycle.go
+++ b/routing/payment_lifecycle.go
@@ -761,7 +761,7 @@ func (p *paymentLifecycle) amendFirstHopData(rt *route.Route) error {
 	// and apply its side effects to the UpdateAddHTLC message.
 	result, err := fn.MapOptionZ(
 		p.router.cfg.TrafficShaper,
-		//nolint:ll
+		//nolint:lll
 		func(ts htlcswitch.AuxTrafficShaper) fn.Result[extraDataRequest] {
 			newAmt, newRecords, err := ts.ProduceHtlcExtraData(
 				rt.TotalAmount, p.firstHopCustomRecords,