diff --git a/graph/db/graph.go b/graph/db/graph.go index 06bd0257d..326c66ab0 100644 --- a/graph/db/graph.go +++ b/graph/db/graph.go @@ -904,10 +904,7 @@ func (c *ChannelGraph) AddLightningNode(node *models.LightningNode, cNode := newGraphCacheNode( node.PubKeyBytes, node.Features, ) - err := c.graphCache.AddNode(tx, cNode) - if err != nil { - return err - } + c.graphCache.AddNodeFeatures(cNode) } return addLightningNode(tx, node) diff --git a/graph/db/graph_cache.go b/graph/db/graph_cache.go index a034e23af..67f34e86e 100644 --- a/graph/db/graph_cache.go +++ b/graph/db/graph_cache.go @@ -136,23 +136,6 @@ func (c *GraphCache) AddNodeFeatures(node GraphCacheNode) { c.mtx.Unlock() } -// AddNode adds a graph node, including all the (directed) channels of that -// node. -func (c *GraphCache) AddNode(tx kvdb.RTx, node GraphCacheNode) error { - c.AddNodeFeatures(node) - - return node.ForEachChannel( - tx, func(tx kvdb.RTx, info *models.ChannelEdgeInfo, - outPolicy *models.ChannelEdgePolicy, - inPolicy *models.ChannelEdgePolicy) error { - - c.AddChannel(info, outPolicy, inPolicy) - - return nil - }, - ) -} - // AddChannel adds a non-directed channel, meaning that the order of policy 1 // and policy 2 does not matter, the directionality is extracted from the info // and policy flags automatically. The policy will be set as the outgoing policy diff --git a/graph/db/graph_cache_test.go b/graph/db/graph_cache_test.go index 69abb2597..35048e7cd 100644 --- a/graph/db/graph_cache_test.go +++ b/graph/db/graph_cache_test.go @@ -88,18 +88,16 @@ func TestGraphCacheAddNode(t *testing.T) { node := &node{ pubKey: nodeA, features: lnwire.EmptyFeatureVector(), - edgeInfos: []*models.ChannelEdgeInfo{{ - ChannelID: 1000, - // Those are direction independent! - NodeKey1Bytes: pubKey1, - NodeKey2Bytes: pubKey2, - Capacity: 500, - }}, - outPolicies: []*models.ChannelEdgePolicy{outPolicy1}, - inPolicies: []*models.ChannelEdgePolicy{inPolicy1}, } cache := NewGraphCache(10) - require.NoError(t, cache.AddNode(nil, node)) + cache.AddNodeFeatures(node) + cache.AddChannel(&models.ChannelEdgeInfo{ + ChannelID: 1000, + // Those are direction independent! + NodeKey1Bytes: pubKey1, + NodeKey2Bytes: pubKey2, + Capacity: 500, + }, outPolicy1, inPolicy1) var fromChannels, toChannels []*DirectedChannel _ = cache.ForEachChannel(nodeA, func(c *DirectedChannel) error {