multi: update to fn v2

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"