highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-11-10 14:17:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

discovery+graph: update callers to use new iterator APIs

Browse Source 
In this commit, we update all callers of NodeUpdatesInHorizon and
ChanUpdatesInHorizon to use the new iterator-based APIs. The changes
use fn.Collect to maintain existing behavior while benefiting from the
memory efficiency of iterators when possible.
This commit is contained in:
Olaoluwa Osuntokun
2025-08-04 16:05:57 -07:00
parent 32528afa0a
commit fda989da9c
1 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
discovery/chan_series.go
View File

@@ -5,7 +5,6 @@ import (
"time" "time"
"github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/lightningnetwork/lnd/fn/v2"
graphdb "github.com/lightningnetwork/lnd/graph/db" graphdb "github.com/lightningnetwork/lnd/graph/db"
"github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/netann" "github.com/lightningnetwork/lnd/netann"
@@ -121,12 +120,8 @@ func (c *ChanSeries) UpdatesInHorizon(chain chainhash.Hash,
if err != nil { if err != nil {
return nil, err return nil, err
} }
chansInHorizon := fn.Collect(chansInHorizonIter)
// nodesFromChan records the nodes seen from the channels. for channel := range chansInHorizonIter {
nodesFromChan := make(map[[33]byte]struct{}, len(chansInHorizon)*2)
for _, channel := range chansInHorizon {
// If the channel hasn't been fully advertised yet, or is a // If the channel hasn't been fully advertised yet, or is a
// private channel, then we'll skip it as we can't construct a // private channel, then we'll skip it as we can't construct a
// full authentication proof if one is requested. // full authentication proof if one is requested.
@@ -187,47 +182,19 @@ func (c *ChanSeries) UpdatesInHorizon(chain chainhash.Hash,
// Append the all the msgs to the slice. // Append the all the msgs to the slice.
updates = append(updates, chanUpdates...) updates = append(updates, chanUpdates...)
// Record the nodes seen.
nodesFromChan[channel.Info.NodeKey1Bytes] = struct{}{}
nodesFromChan[channel.Info.NodeKey2Bytes] = struct{}{}
} }
// Next, we'll send out all the node announcements that have an update // Next, we'll send out all the node announcements that have an update
// within the horizon as well. We send these second to ensure that they // within the horizon as well. We send these second to ensure that they
// follow any active channels they have. // follow any active channels they have.
nodeAnnsInHorizon, err := c.graph.NodeUpdatesInHorizon( nodeAnnsInHorizon, err := c.graph.NodeUpdatesInHorizon(
startTime, endTime, startTime, endTime, graphdb.WithIterPublicNodesOnly(),
) )
if err != nil { if err != nil {
return nil, err return nil, err
} }
for nodeAnn := range nodeAnnsInHorizon { for nodeAnn := range nodeAnnsInHorizon {
// If this node has not been seen in the above channels, we can
// skip sending its NodeAnnouncement.
if _, seen := nodesFromChan[nodeAnn.PubKeyBytes]; !seen {
log.Debugf("Skipping forwarding as node %x not found "+
"in channel announcement", nodeAnn.PubKeyBytes)
continue
}
// Ensure we only forward nodes that are publicly advertised to
// prevent leaking information about nodes.
isNodePublic, err := c.graph.IsPublicNode(nodeAnn.PubKeyBytes)
if err != nil {
log.Errorf("Unable to determine if node %x is "+
"advertised: %v", nodeAnn.PubKeyBytes, err)
continue
}
if !isNodePublic {
log.Tracef("Skipping forwarding announcement for "+
"node %x due to being unadvertised",
nodeAnn.PubKeyBytes)
continue
}
nodeUpdate, err := nodeAnn.NodeAnnouncement(true) nodeUpdate, err := nodeAnn.NodeAnnouncement(true)
if err != nil { if err != nil {
return nil, err return nil, err