Skip to content

Commit ed2989a

Browse files
ProofOfKeagsProofOfKeags
committed
multi: update to fn v2
1 parent 48fba10 commit ed2989a

File tree

167 files changed

+372
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+372
-302
lines changed

‎aliasmgr/aliasmgr.go

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"sync"
77

8-
"github.com/lightningnetwork/lnd/fn"
8+
"github.com/lightningnetwork/lnd/fn/v2"
99
"github.com/lightningnetwork/lnd/htlcswitch/hop"
1010
"github.com/lightningnetwork/lnd/kvdb"
1111
"github.com/lightningnetwork/lnd/lnwire"
@@ -432,9 +432,9 @@ func (m *Manager) DeleteLocalAlias(alias,
432432
}
433433

434434
// We'll filter the alias set and remove the alias from it.
435-
aliasSet = fn.Filter(func(a lnwire.ShortChannelID) bool {
435+
aliasSet = fn.Filter(aliasSet, func(a lnwire.ShortChannelID) bool {
436436
return a.ToUint64() != alias.ToUint64()
437-
}, aliasSet)
437+
})
438438

439439
// If the alias set is empty, we'll delete the base SCID from the
440440
// baseToSet map.
@@ -514,11 +514,17 @@ func (m *Manager) RequestAlias() (lnwire.ShortChannelID, error) {
514514
// haveAlias returns true if the passed alias is already assigned to a
515515
// channel in the baseToSet map.
516516
haveAlias := func(maybeNextAlias lnwire.ShortChannelID) bool {
517-
return fn.Any(func(aliasList []lnwire.ShortChannelID) bool {
518-
return fn.Any(func(alias lnwire.ShortChannelID) bool {
519-
return alias == maybeNextAlias
520-
}, aliasList)
521-
}, maps.Values(m.baseToSet))
517+
return fn.Any(
518+
maps.Values(m.baseToSet),
519+
func(aliasList []lnwire.ShortChannelID) bool {
520+
return fn.Any(
521+
aliasList,
522+
func(alias lnwire.ShortChannelID) bool {
523+
return alias == maybeNextAlias
524+
},
525+
)
526+
},
527+
)
522528
}
523529

524530
err := kvdb.Update(m.backend, func(tx kvdb.RwTx) error {

‎chainntnfs/bitcoindnotify/bitcoind.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/btcsuite/btcwallet/chain"
1616
"github.com/lightningnetwork/lnd/blockcache"
1717
"github.com/lightningnetwork/lnd/chainntnfs"
18-
"github.com/lightningnetwork/lnd/fn"
18+
"github.com/lightningnetwork/lnd/fn/v2"
1919
"github.com/lightningnetwork/lnd/queue"
2020
)
2121

‎chainntnfs/btcdnotify/btcd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/btcsuite/btcwallet/chain"
1818
"github.com/lightningnetwork/lnd/blockcache"
1919
"github.com/lightningnetwork/lnd/chainntnfs"
20-
"github.com/lightningnetwork/lnd/fn"
20+
"github.com/lightningnetwork/lnd/fn/v2"
2121
"github.com/lightningnetwork/lnd/queue"
2222
)
2323

‎chainntnfs/interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/btcsuite/btcd/btcutil"
1414
"github.com/btcsuite/btcd/chaincfg/chainhash"
1515
"github.com/btcsuite/btcd/wire"
16-
"github.com/lightningnetwork/lnd/fn"
16+
"github.com/lightningnetwork/lnd/fn/v2"
1717
)
1818

1919
var (

‎chainntnfs/mocks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package chainntnfs
33
import (
44
"github.com/btcsuite/btcd/chaincfg/chainhash"
55
"github.com/btcsuite/btcd/wire"
6-
"github.com/lightningnetwork/lnd/fn"
6+
"github.com/lightningnetwork/lnd/fn/v2"
77
"github.com/stretchr/testify/mock"
88
)
99

‎chainreg/chainregistry.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/lightningnetwork/lnd/chainntnfs/btcdnotify"
2424
"github.com/lightningnetwork/lnd/chainntnfs/neutrinonotify"
2525
"github.com/lightningnetwork/lnd/channeldb"
26-
"github.com/lightningnetwork/lnd/fn"
26+
"github.com/lightningnetwork/lnd/fn/v2"
2727
"github.com/lightningnetwork/lnd/graph/db/models"
2828
"github.com/lightningnetwork/lnd/input"
2929
"github.com/lightningnetwork/lnd/keychain"

‎chanbackup/backup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/btcsuite/btcd/wire"
77
"github.com/lightningnetwork/lnd/channeldb"
8-
"github.com/lightningnetwork/lnd/fn"
8+
"github.com/lightningnetwork/lnd/fn/v2"
99
)
1010

1111
// LiveChannelSource is an interface that allows us to query for the set of

‎chanbackup/single.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/btcsuite/btcd/chaincfg/chainhash"
1313
"github.com/btcsuite/btcd/wire"
1414
"github.com/lightningnetwork/lnd/channeldb"
15-
"github.com/lightningnetwork/lnd/fn"
15+
"github.com/lightningnetwork/lnd/fn/v2"
1616
"github.com/lightningnetwork/lnd/keychain"
1717
"github.com/lightningnetwork/lnd/lnencrypt"
1818
"github.com/lightningnetwork/lnd/lnwire"

‎chanbackup/single_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/btcsuite/btcd/wire"
1414
"github.com/davecgh/go-spew/spew"
1515
"github.com/lightningnetwork/lnd/channeldb"
16-
"github.com/lightningnetwork/lnd/fn"
16+
"github.com/lightningnetwork/lnd/fn/v2"
1717
"github.com/lightningnetwork/lnd/keychain"
1818
"github.com/lightningnetwork/lnd/lnencrypt"
1919
"github.com/lightningnetwork/lnd/lnwire"

‎channeldb/channel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/btcsuite/btcd/chaincfg/chainhash"
2020
"github.com/btcsuite/btcd/wire"
2121
"github.com/btcsuite/btcwallet/walletdb"
22-
"github.com/lightningnetwork/lnd/fn"
22+
"github.com/lightningnetwork/lnd/fn/v2"
2323
graphdb "github.com/lightningnetwork/lnd/graph/db"
2424
"github.com/lightningnetwork/lnd/graph/db/models"
2525
"github.com/lightningnetwork/lnd/htlcswitch/hop"

0 commit comments

Comments
 (0)