@@ -289,8 +289,10 @@ func (g *ChannelGraph) populateGraphCache() {
289
289
return
290
290
}
291
291
292
- log .Debugf ("Finished populating in-memory channel graph (took " +
293
- "%v, %s)" , time .Since (startTime ), g .graphCache .Stats ())
292
+ if g .graphCache != nil {
293
+ log .Debugf ("Finished populating in-memory channel graph (took " +
294
+ "%v, %s)" , time .Since (startTime ), g .graphCache .Stats ())
295
+ }
294
296
295
297
g .graphCacheReady .Store (true )
296
298
}
@@ -898,16 +900,18 @@ func (c *ChannelGraph) AddLightningNode(node *LightningNode,
898
900
Update : func (tx kvdb.RwTx ) error {
899
901
graphCache , err := c .getGraphCache ()
900
902
if err != nil {
901
- if err == ErrGraphCacheNotReady {
903
+ if errors . Is ( err , ErrGraphCacheNotReady ) {
902
904
// Queue this update function
903
905
c .enqueueWriteOperation (func () error {
904
906
return c .AddLightningNode (
905
907
node ,
906
908
op ... ,
907
909
)
908
910
})
911
+
909
912
return nil
910
913
}
914
+
911
915
return err
912
916
}
913
917
@@ -917,6 +921,7 @@ func (c *ChannelGraph) AddLightningNode(node *LightningNode,
917
921
)
918
922
err := graphCache .AddNode (tx , cNode )
919
923
if err != nil {
924
+
920
925
return err
921
926
}
922
927
}
@@ -1001,7 +1006,7 @@ func (c *ChannelGraph) DeleteLightningNode(nodePub route.Vertex) error {
1001
1006
1002
1007
graphCache , err := c .getGraphCache ()
1003
1008
if err != nil {
1004
- if err == ErrGraphCacheNotReady {
1009
+ if errors . Is ( err , ErrGraphCacheNotReady ) {
1005
1010
// Queue this delete function
1006
1011
c .enqueueWriteOperation (func () error {
1007
1012
return c .DeleteLightningNode (nodePub )
@@ -1144,7 +1149,7 @@ func (c *ChannelGraph) addChannelEdge(tx kvdb.RwTx,
1144
1149
1145
1150
graphCache , err := c .getGraphCache ()
1146
1151
if err != nil {
1147
- if err == ErrGraphCacheNotReady {
1152
+ if errors . Is ( err , ErrGraphCacheNotReady ) {
1148
1153
// Queue this function
1149
1154
c .enqueueWriteOperation (func () error {
1150
1155
return c .addChannelEdge (tx , edge )
@@ -1359,7 +1364,7 @@ func (c *ChannelGraph) UpdateChannelEdge(edge *models.ChannelEdgeInfo) error {
1359
1364
1360
1365
graphCache , err := c .getGraphCache ()
1361
1366
if err != nil {
1362
- if err == ErrGraphCacheNotReady {
1367
+ if errors . Is ( err , ErrGraphCacheNotReady ) {
1363
1368
// Queue this update function
1364
1369
c .enqueueWriteOperation (func () error {
1365
1370
return c .UpdateChannelEdge (edge )
@@ -1606,7 +1611,7 @@ func (c *ChannelGraph) pruneGraphNodes(nodes kvdb.RwBucket,
1606
1611
1607
1612
graphCache , err := c .getGraphCache ()
1608
1613
if err != nil {
1609
- if err == ErrGraphCacheNotReady {
1614
+ if errors . Is ( err , ErrGraphCacheNotReady ) {
1610
1615
// Queue this prune operation
1611
1616
c .enqueueWriteOperation (func () error {
1612
1617
return c .pruneGraphNodes (nodes , edgeIndex )
@@ -2660,7 +2665,7 @@ func (c *ChannelGraph) delChannelEdgeUnsafe(edges, edgeIndex, chanIndex,
2660
2665
2661
2666
graphCache , err := c .getGraphCache ()
2662
2667
if err != nil {
2663
- if err == ErrGraphCacheNotReady {
2668
+ if errors . Is ( err , ErrGraphCacheNotReady ) {
2664
2669
// Queue this delete function
2665
2670
c .enqueueWriteOperation (func () error {
2666
2671
return c .delChannelEdgeUnsafe (edges , edgeIndex , chanIndex , zombieIndex , chanID , isZombie , strictZombie )
@@ -2929,7 +2934,7 @@ func updateEdgePolicy(tx kvdb.RwTx, edge *models.ChannelEdgePolicy,
2929
2934
2930
2935
graphCache , err := c .getGraphCache ()
2931
2936
if err != nil {
2932
- if err == ErrGraphCacheNotReady {
2937
+ if errors . Is ( err , ErrGraphCacheNotReady ) {
2933
2938
// Queue this update function
2934
2939
c .enqueueWriteOperation (func () error {
2935
2940
_ , err := updateEdgePolicy (tx , edge , c )
@@ -3822,7 +3827,7 @@ func (c *ChannelGraph) MarkEdgeZombie(chanID uint64,
3822
3827
3823
3828
graphCache , err := c .getGraphCache ()
3824
3829
if err != nil {
3825
- if err == ErrGraphCacheNotReady {
3830
+ if errors . Is ( err , ErrGraphCacheNotReady ) {
3826
3831
// Queue this function
3827
3832
c .enqueueWriteOperation (func () error {
3828
3833
return c .MarkEdgeZombie (chanID , pubKey1 , pubKey2 )
@@ -3918,7 +3923,7 @@ func (c *ChannelGraph) markEdgeLiveUnsafe(tx kvdb.RwTx, chanID uint64) error {
3918
3923
// won't use it for path finding.
3919
3924
graphCache , err := c .getGraphCache ()
3920
3925
if err != nil {
3921
- if err == ErrGraphCacheNotReady {
3926
+ if errors . Is ( err , ErrGraphCacheNotReady ) {
3922
3927
// Queue the operation to add the channel back.
3923
3928
c .enqueueWriteOperation (func () error {
3924
3929
return c .markEdgeLiveUnsafe (tx , chanID )
0 commit comments