Merge pull request #9330 from ProofOfKeags/update/fn2

multi: update to fn v2

aliasmgr/aliasmgr.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/htlcswitch/hop"
 	"github.com/lightningnetwork/lnd/kvdb"
 	"github.com/lightningnetwork/lnd/lnwire"
@@ -432,9 +432,9 @@ func (m *Manager) DeleteLocalAlias(alias,
 	}
 
 	// We'll filter the alias set and remove the alias from it.
-	aliasSet = fn.Filter(func(a lnwire.ShortChannelID) bool {
+	aliasSet = fn.Filter(aliasSet, func(a lnwire.ShortChannelID) bool {
 		return a.ToUint64() != alias.ToUint64()
-	}, aliasSet)
+	})
 
 	// If the alias set is empty, we'll delete the base SCID from the
 	// baseToSet map.
@@ -514,11 +514,17 @@ func (m *Manager) RequestAlias() (lnwire.ShortChannelID, error) {
 	// haveAlias returns true if the passed alias is already assigned to a
 	// channel in the baseToSet map.
 	haveAlias := func(maybeNextAlias lnwire.ShortChannelID) bool {
-		return fn.Any(func(aliasList []lnwire.ShortChannelID) bool {
-			return fn.Any(func(alias lnwire.ShortChannelID) bool {
-				return alias == maybeNextAlias
-			}, aliasList)
-		}, maps.Values(m.baseToSet))
+		return fn.Any(
+			maps.Values(m.baseToSet),
+			func(aliasList []lnwire.ShortChannelID) bool {
+				return fn.Any(
+					aliasList,
+					func(alias lnwire.ShortChannelID) bool {
+						return alias == maybeNextAlias
+					},
+				)
+			},
+		)
 	}
 
 	err := kvdb.Update(m.backend, func(tx kvdb.RwTx) error {

chainntnfs/bitcoindnotify/bitcoind.go

@@ -15,7 +15,7 @@ import (
 	"github.com/btcsuite/btcwallet/chain"
 	"github.com/lightningnetwork/lnd/blockcache"
 	"github.com/lightningnetwork/lnd/chainntnfs"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/queue"
 )
 

chainntnfs/btcdnotify/btcd.go

@@ -17,7 +17,7 @@ import (
 	"github.com/btcsuite/btcwallet/chain"
 	"github.com/lightningnetwork/lnd/blockcache"
 	"github.com/lightningnetwork/lnd/chainntnfs"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/queue"
 )
 

chainntnfs/interface.go

@@ -13,7 +13,7 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 )
 
 var (

chainntnfs/mocks.go

@@ -3,7 +3,7 @@ package chainntnfs
 import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/stretchr/testify/mock"
 )
 

chainreg/chainregistry.go

@@ -23,7 +23,7 @@ import (
 	"github.com/lightningnetwork/lnd/chainntnfs/btcdnotify"
 	"github.com/lightningnetwork/lnd/chainntnfs/neutrinonotify"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/graph/db/models"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"

chanbackup/backup.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 )
 
 // LiveChannelSource is an interface that allows us to query for the set of

chanbackup/single.go

@@ -12,7 +12,7 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnencrypt"
 	"github.com/lightningnetwork/lnd/lnwire"

chanbackup/single_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/btcsuite/btcd/wire"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnencrypt"
 	"github.com/lightningnetwork/lnd/lnwire"

channeldb/channel.go

@@ -19,7 +19,7 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcwallet/walletdb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	graphdb "github.com/lightningnetwork/lnd/graph/db"
 	"github.com/lightningnetwork/lnd/graph/db/models"
 	"github.com/lightningnetwork/lnd/htlcswitch/hop"

channeldb/channel_test.go

@@ -18,7 +18,7 @@ import (
 	_ "github.com/btcsuite/btcwallet/walletdb/bdb"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/lightningnetwork/lnd/clock"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/graph/db/models"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/kvdb"

channeldb/migration/lnwire21/custom_records.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"sort"
 
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/tlv"
 )
 
@@ -163,9 +163,12 @@ func (c CustomRecords) SerializeTo(w io.Writer) error {
 // ProduceRecordsSorted converts a slice of record producers into a slice of
 // records and then sorts it by type.
 func ProduceRecordsSorted(recordProducers ...tlv.RecordProducer) []tlv.Record {
-	records := fn.Map(func(producer tlv.RecordProducer) tlv.Record {
-		return producer.Record()
-	}, recordProducers)
+	records := fn.Map(
+		recordProducers,
+		func(producer tlv.RecordProducer) tlv.Record {
+			return producer.Record()
+		},
+	)
 
 	// Ensure that the set of records are sorted before we attempt to
 	// decode from the stream, to ensure they're canonical.
@@ -196,9 +199,9 @@ func TlvMapToRecords(tlvMap tlv.TypeMap) []tlv.Record {
 // RecordsAsProducers converts a slice of records into a slice of record
 // producers.
 func RecordsAsProducers(records []tlv.Record) []tlv.RecordProducer {
-	return fn.Map(func(record tlv.Record) tlv.RecordProducer {
+	return fn.Map(records, func(record tlv.Record) tlv.RecordProducer {
 		return &record
-	}, records)
+	})
 }
 
 // EncodeRecords encodes the given records into a byte slice.

channeldb/migration32/mission_control_store.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/btcsuite/btcd/wire"
 	lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/tlv"
 )
 
@@ -371,7 +371,7 @@ func extractMCRoute(r *Route) *mcRoute {
 // extractMCHops extracts the Hop fields that MC actually uses from a slice of
 // Hops.
 func extractMCHops(hops []*Hop) mcHops {
-	return fn.Map(extractMCHop, hops)
+	return fn.Map(hops, extractMCHop)
 }
 
 // extractMCHop extracts the Hop fields that MC actually uses from a Hop.

channeldb/revocation_log.go

@@ -7,7 +7,7 @@ import (
 	"math"
 
 	"github.com/btcsuite/btcd/btcutil"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/kvdb"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/lnwire"

channeldb/revocation_log_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/btcsuite/btcd/btcutil"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/kvdb"
 	"github.com/lightningnetwork/lnd/lntest/channels"
 	"github.com/lightningnetwork/lnd/lnwire"

cmd/commands/cmd_macaroon.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/lncfg"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/macaroons"
@@ -177,12 +177,15 @@ func bakeMacaroon(ctx *cli.Context) error {
 				"%w", err)
 		}
 
-		ops := fn.Map(func(p *lnrpc.MacaroonPermission) bakery.Op {
-			return bakery.Op{
-				Entity: p.Entity,
-				Action: p.Action,
-			}
-		}, parsedPermissions)
+		ops := fn.Map(
+			parsedPermissions,
+			func(p *lnrpc.MacaroonPermission) bakery.Op {
+				return bakery.Op{
+					Entity: p.Entity,
+					Action: p.Action,
+				}
+			},
+		)
 
 		rawMacaroon, err = macaroons.BakeFromRootKey(macRootKey, ops)
 		if err != nil {

config_builder.go

@@ -33,7 +33,7 @@ import (
 	"github.com/lightningnetwork/lnd/chainreg"
 	"github.com/lightningnetwork/lnd/channeldb"
 	"github.com/lightningnetwork/lnd/clock"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/funding"
 	graphdb "github.com/lightningnetwork/lnd/graph/db"
 	"github.com/lightningnetwork/lnd/htlcswitch"

contractcourt/anchor_resolver.go

@@ -9,7 +9,7 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/sweep"
 )

contractcourt/breach_arbitrator.go

@@ -15,7 +15,7 @@ import (
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	graphdb "github.com/lightningnetwork/lnd/graph/db"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/kvdb"
@@ -1537,9 +1537,9 @@ func (b *BreachArbitrator) createSweepTx(
 	// outputs from the regular, BTC only outputs. So we only need one such
 	// output, which'll carry the custom channel "valuables" from both the
 	// breached commitment and HTLC outputs.
-	hasBlobs := fn.Any(func(i input.Input) bool {
+	hasBlobs := fn.Any(inputs, func(i input.Input) bool {
 		return i.ResolutionBlob().IsSome()
-	}, inputs)
+	})
 	if hasBlobs {
 		weightEstimate.AddP2TROutput()
 	}
@@ -1624,7 +1624,7 @@ func (b *BreachArbitrator) sweepSpendableOutputsTxn(txWeight lntypes.WeightUnit,
 	// First, we'll add the extra sweep output if it exists, subtracting the
 	// amount from the sweep amt.
 	if b.cfg.AuxSweeper.IsSome() {
-		extraChangeOut.WhenResult(func(o sweep.SweepOutput) {
+		extraChangeOut.WhenOk(func(o sweep.SweepOutput) {
 			sweepAmt -= o.Value
 
 			txn.AddTxOut(&o.TxOut)
@@ -1697,7 +1697,7 @@ func (b *BreachArbitrator) sweepSpendableOutputsTxn(txWeight lntypes.WeightUnit,
 	return &justiceTxCtx{
 		justiceTx:  txn,
 		sweepAddr:  pkScript,
-		extraTxOut: extraChangeOut.Option(),
+		extraTxOut: extraChangeOut.OkToSome(),
 		fee:        txFee,
 		inputs:     inputs,
 	}, nil

contractcourt/breach_arbitrator_test.go

@@ -22,7 +22,7 @@ import (
 	"github.com/go-errors/errors"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lntest/channels"

contractcourt/briefcase.go

@@ -10,7 +10,7 @@ import (
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/kvdb"
 	"github.com/lightningnetwork/lnd/lnwallet"

contractcourt/briefcase_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/btcsuite/btcd/wire"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/kvdb"
 	"github.com/lightningnetwork/lnd/lnmock"

contractcourt/chain_arbitrator.go

@@ -14,7 +14,7 @@ import (
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/channeldb"
 	"github.com/lightningnetwork/lnd/clock"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/graph/db/models"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/kvdb"

contractcourt/chain_watcher.go

@@ -18,7 +18,7 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"github.com/lightningnetwork/lnd/chainntnfs"
 	"github.com/lightningnetwork/lnd/channeldb"
-	"github.com/lightningnetwork/lnd/fn"
+	"github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/lnutils"
@@ -451,7 +451,7 @@ func (c *chainWatcher) handleUnknownLocalState(
 		leaseExpiry = c.cfg.chanState.ThawHeight
 	}
 
-	remoteAuxLeaf := fn.ChainOption(
+	remoteAuxLeaf := fn.FlatMapOption(
 		func(l lnwallet.CommitAuxLeaves) input.AuxTapLeaf {
 			return l.RemoteAuxLeaf
 		},
@@ -468,7 +468,7 @@ func (c *chainWatcher) handleUnknownLocalState(
 	// Next, we'll derive our script that includes the revocation base for
 	// the remote party allowing them to claim this output before the CSV
 	// delay if we breach.
-	localAuxLeaf := fn.ChainOption(
+	localAuxLeaf := fn.FlatMapOption(
 		func(l lnwallet.CommitAuxLeaves) input.AuxTapLeaf {
 			return l.LocalAuxLeaf
 		},
@@ -1062,15 +1062,15 @@ func (c *chainWatcher) toSelfAmount(tx *wire.MsgTx) btcutil.Amount {
 			return false
 		}
 
-		return fn.Any(c.cfg.isOurAddr, addrs)
+		return fn.Any(addrs, c.cfg.isOurAddr)
 	}
 
 	// Grab all of the outputs that correspond with our delivery address
 	// or our wallet is aware of.
-	outs := fn.Filter(fn.PredOr(isDeliveryOutput, isWalletOutput), tx.TxOut)
+	outs := fn.Filter(tx.TxOut, fn.PredOr(isDeliveryOutput, isWalletOutput))
 
 	// Grab the values for those outputs.
-	vals := fn.Map(func(o *wire.TxOut) int64 { return o.Value }, outs)
+	vals := fn.Map(outs, func(o *wire.TxOut) int64 { return o.Value })
 
 	// Return the sum.
 	return btcutil.Amount(fn.Sum(vals))