Merge pull request #9330 from ProofOfKeags/update/fn2

multi: update to fn v2
This commit is contained in:
Olaoluwa Osuntokun
2024-12-09 12:56:23 +01:00
committed by GitHub
167 changed files with 372 additions and 302 deletions

View File

@@ -15,7 +15,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/graph/db/models"
"github.com/lightningnetwork/lnd/htlcswitch/hop"
"github.com/lightningnetwork/lnd/input"
@@ -1009,7 +1009,7 @@ func (c *ChannelArbitrator) stateStep(
getIdx := func(htlc channeldb.HTLC) uint64 {
return htlc.HtlcIndex
}
dustHTLCSet := fn.NewSet(fn.Map(getIdx, dustHTLCs)...)
dustHTLCSet := fn.NewSet(fn.Map(dustHTLCs, getIdx)...)
err = c.abandonForwards(dustHTLCSet)
if err != nil {
return StateError, closeTx, err
@@ -1318,7 +1318,7 @@ func (c *ChannelArbitrator) stateStep(
return htlc.HtlcIndex
}
remoteDangling := fn.NewSet(fn.Map(
getIdx, htlcActions[HtlcFailDanglingAction],
htlcActions[HtlcFailDanglingAction], getIdx,
)...)
err := c.abandonForwards(remoteDangling)
if err != nil {