multi: update independent usages of lnd/fn to lnd/fn/v2

guggero · guggero · commit 3cc317843758 · 2025-03-11T16:03:42.000-05:00
To reduce the size of the diff in the next commit, we update all usages
of the lnd fn package where they are independent from lnd (meaning we
don't use the results to interact with lnd).
Anywhere we interact with lnd, we need to use the same version as lnd,
so we'll need to do it in the next commit where we bump the lnd
dependency.
diff --git a/cmd/commands/commands.go b/cmd/commands/commands.go
@@ -9,7 +9,7 @@ import (
 
 	tap "github.com/lightninglabs/taproot-assets"
 	"github.com/lightninglabs/taproot-assets/taprpc"
-	lfn "github.com/lightningnetwork/lnd/fn"
+	lfn "github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/signal"
 	"github.com/urfave/cli"
 	"google.golang.org/protobuf/proto"
diff --git a/fn/func.go b/fn/func.go
@@ -3,7 +3,7 @@ package fn
 import (
 	"fmt"
 
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 )
 
 // Reducer represents a function that takes an accumulator and the value, then
diff --git a/go.mod b/go.mod
@@ -32,6 +32,7 @@ require (
 	github.com/lightningnetwork/lnd/cert v1.2.2
 	github.com/lightningnetwork/lnd/clock v1.1.1
 	github.com/lightningnetwork/lnd/fn v1.2.3
+	github.com/lightningnetwork/lnd/fn/v2 v2.0.8
 	github.com/lightningnetwork/lnd/tlv v1.2.6
 	github.com/lightningnetwork/lnd/tor v1.1.2
 	github.com/ory/dockertest/v3 v3.10.0
diff --git a/go.sum b/go.sum
@@ -506,6 +506,8 @@ github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsD
 github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
 github.com/lightningnetwork/lnd/fn v1.2.3 h1:Q1OrgNSgQynVheBNa16CsKVov1JI5N2AR6G07x9Mles=
 github.com/lightningnetwork/lnd/fn v1.2.3/go.mod h1:SyFohpVrARPKH3XVAJZlXdVe+IwMYc4OMAvrDY32kw0=
+github.com/lightningnetwork/lnd/fn/v2 v2.0.8 h1:r2SLz7gZYQPVc3IZhU82M66guz3Zk2oY+Rlj9QN5S3g=
+github.com/lightningnetwork/lnd/fn/v2 v2.0.8/go.mod h1:TOzwrhjB/Azw1V7aa8t21ufcQmdsQOQMDtxVOQWNl8s=
 github.com/lightningnetwork/lnd/healthcheck v1.2.5 h1:aTJy5xeBpcWgRtW/PGBDe+LMQEmNm/HQewlQx2jt7OA=
 github.com/lightningnetwork/lnd/healthcheck v1.2.5/go.mod h1:G7Tst2tVvWo7cx6mSBEToQC5L1XOGxzZTPB29g9Rv2I=
 github.com/lightningnetwork/lnd/kvdb v1.4.10 h1:vK89IVv1oVH9ubQWU+EmoCQFeVRaC8kfmOrqHbY5zoY=
diff --git a/internal/pedersen/commitment.go b/internal/pedersen/commitment.go
@@ -4,7 +4,7 @@ import (
 	"crypto/sha256"
 
 	"github.com/btcsuite/btcd/btcec/v2"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/input"
 )
 
diff --git a/internal/pedersen/commitment_test.go b/internal/pedersen/commitment_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcd/btcec/v2"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/stretchr/testify/require"
 	"pgregory.net/rapid"
 )
diff --git a/itest/tapd_harness.go b/itest/tapd_harness.go
@@ -27,7 +27,7 @@ import (
 	tchrpc "github.com/lightninglabs/taproot-assets/taprpc/tapchannelrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/tapdevrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/universerpc"
-	lfn "github.com/lightningnetwork/lnd/fn"
+	lfn "github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lntest/node"
 	"github.com/lightningnetwork/lnd/lntest/wait"
diff --git a/proof/proof_test.go b/proof/proof_test.go
@@ -13,8 +13,6 @@ import (
 	"testing"
 	"time"
 
-	lfn "github.com/lightningnetwork/lnd/fn"
-
 	"github.com/btcsuite/btcd/blockchain"
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcutil"
@@ -29,6 +27,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/internal/test"
 	"github.com/lightningnetwork/lnd/build"
+	lfn "github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/tlv"
 	"github.com/stretchr/testify/require"
 	"pgregory.net/rapid"
diff --git a/proof/verifier.go b/proof/verifier.go
@@ -17,7 +17,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/commitment"
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/vm"
-	lfn "github.com/lightningnetwork/lnd/fn"
+	lfn "github.com/lightningnetwork/lnd/fn/v2"
 	"golang.org/x/exp/maps"
 	"golang.org/x/sync/errgroup"
 )
diff --git a/rfq/manager.go b/rfq/manager.go
@@ -13,7 +13,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/asset"
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/rfqmsg"
-	lfn "github.com/lightningnetwork/lnd/fn"
+	lfn "github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/lnutils"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/routing/route"
@@ -554,9 +554,11 @@ func (m *Manager) addScidAlias(scidAlias uint64, assetSpecifier asset.Specifier,
 	}
 
 	// Filter for channels with the given peer.
-	peerChannels := lfn.Filter(func(c lndclient.ChannelInfo) bool {
-		return c.PubKeyBytes == peer
-	}, localChans)
+	peerChannels := lfn.Filter(
+		localChans, func(c lndclient.ChannelInfo) bool {
+			return c.PubKeyBytes == peer
+		},
+	)
 
 	var baseSCID uint64
 	for _, localChan := range peerChannels {
diff --git a/tapdb/assets_common.go b/tapdb/assets_common.go
@@ -17,7 +17,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightninglabs/taproot-assets/tapdb/sqlc"
-	lfn "github.com/lightningnetwork/lnd/fn"
+	lfn "github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/keychain"
 )
 
diff --git a/taprpc/priceoraclerpc/marshal.go b/taprpc/priceoraclerpc/marshal.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/lightninglabs/taproot-assets/rfqmath"
 	"github.com/lightninglabs/taproot-assets/rfqmsg"
-	lfn "github.com/lightningnetwork/lnd/fn"
+	lfn "github.com/lightningnetwork/lnd/fn/v2"
 )
 
 // IsAssetBtc is a helper function that returns true if the given asset
diff --git a/tapsend/send.go b/tapsend/send.go
@@ -27,7 +27,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/tappsbt"
 	"github.com/lightninglabs/taproot-assets/tapscript"
-	lfn "github.com/lightningnetwork/lnd/fn"
+	lfn "github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/lnwallet/btcwallet"
 	"golang.org/x/exp/maps"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package fn`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- "github.com/lightningnetwork/lnd/fn"`
	`6`	`+ "github.com/lightningnetwork/lnd/fn/v2"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// Reducer represents a function that takes an accumulator and the value, then`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"crypto/sha256"`
`5`	`5`
`6`	`6`	`"github.com/btcsuite/btcd/btcec/v2"`
`7`		`- "github.com/lightningnetwork/lnd/fn"`
	`7`	`+ "github.com/lightningnetwork/lnd/fn/v2"`
`8`	`8`	`"github.com/lightningnetwork/lnd/input"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`"github.com/btcsuite/btcd/btcec/v2"`
`8`		`- "github.com/lightningnetwork/lnd/fn"`
	`8`	`+ "github.com/lightningnetwork/lnd/fn/v2"`
`9`	`9`	`"github.com/stretchr/testify/require"`
`10`	`10`	`"pgregory.net/rapid"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"github.com/lightninglabs/taproot-assets/commitment"`
`18`	`18`	`"github.com/lightninglabs/taproot-assets/fn"`
`19`	`19`	`"github.com/lightninglabs/taproot-assets/vm"`
`20`		`- lfn "github.com/lightningnetwork/lnd/fn"`
	`20`	`+ lfn "github.com/lightningnetwork/lnd/fn/v2"`
`21`	`21`	`"golang.org/x/exp/maps"`
`22`	`22`	`"golang.org/x/sync/errgroup"`
`23`	`23`	`)`