diff --git a/graph/builder.go b/graph/builder.go index 96b79fcc7..64ce01329 100644 --- a/graph/builder.go +++ b/graph/builder.go @@ -1151,7 +1151,7 @@ func (b *Builder) updateEdge(ctx context.Context, defer b.channelEdgeMtx.Unlock(policy.ChannelID) edge1Timestamp, edge2Timestamp, exists, isZombie, err := - b.cfg.Graph.HasV1ChannelEdge(policy.ChannelID) + b.cfg.Graph.HasV1ChannelEdge(ctx, policy.ChannelID) if err != nil && !errors.Is(err, graphdb.ErrGraphNoEdgesFound) { return fmt.Errorf("unable to check for edge existence: %w", err) } @@ -1366,7 +1366,9 @@ func (b *Builder) IsStaleEdgePolicy(chanID lnwire.ShortChannelID, timestamp time.Time, flags lnwire.ChanUpdateChanFlags) bool { edge1Timestamp, edge2Timestamp, exists, isZombie, err := - b.cfg.Graph.HasV1ChannelEdge(chanID.ToUint64()) + b.cfg.Graph.HasV1ChannelEdge( + context.TODO(), chanID.ToUint64(), + ) if err != nil { log.Debugf("Check stale edge policy got error: %v", err) return false diff --git a/graph/db/graph.go b/graph/db/graph.go index 85e87852d..6c76f4d2e 100644 --- a/graph/db/graph.go +++ b/graph/db/graph.go @@ -674,10 +674,10 @@ func (c *ChannelGraph) DisabledChannelIDs(ctx context.Context, } // HasV1ChannelEdge returns true if the database knows of a channel edge. -func (c *ChannelGraph) HasV1ChannelEdge(chanID uint64) (time.Time, - time.Time, bool, bool, error) { +func (c *ChannelGraph) HasV1ChannelEdge(ctx context.Context, + chanID uint64) (time.Time, time.Time, bool, bool, error) { - return c.db.HasV1ChannelEdge(chanID) + return c.db.HasV1ChannelEdge(ctx, chanID) } // HasChannelEdge returns true if the database knows of a channel edge. diff --git a/graph/db/interfaces.go b/graph/db/interfaces.go index 8db7e0ebe..1ca68eb4e 100644 --- a/graph/db/interfaces.go +++ b/graph/db/interfaces.go @@ -211,8 +211,8 @@ type Store interface { //nolint:interfacebloat // last time the edge was updated for both directed edges are returned // along with the boolean. If it is not found, then the zombie index is // checked and its result is returned as the second boolean. - HasV1ChannelEdge(chanID uint64) (time.Time, time.Time, bool, bool, - error) + HasV1ChannelEdge(ctx context.Context, chanID uint64) ( + time.Time, time.Time, bool, bool, error) // HasChannelEdge returns true if the database knows of a channel edge // with the passed channel ID and gossip version, and false otherwise. diff --git a/graph/db/kv_store.go b/graph/db/kv_store.go index 6fbd7df5a..d258361ee 100644 --- a/graph/db/kv_store.go +++ b/graph/db/kv_store.go @@ -1318,7 +1318,7 @@ func (c *KVStore) addChannelEdge(tx kvdb.RwTx, // the edge was updated for both directed edges are returned along with the // boolean. If it is not found, then the zombie index is checked and its // result is returned as the second boolean. -func (c *KVStore) HasV1ChannelEdge( +func (c *KVStore) HasV1ChannelEdge(_ context.Context, chanID uint64) (time.Time, time.Time, bool, bool, error) { var ( @@ -1434,7 +1434,9 @@ func (c *KVStore) HasChannelEdge(v lnwire.GossipVersion, return false, false, ErrVersionNotSupportedForKVDB } - _, _, exists, isZombie, err := c.HasV1ChannelEdge(chanID) + _, _, exists, isZombie, err := c.HasV1ChannelEdge( + context.TODO(), chanID, + ) return exists, isZombie, err } diff --git a/graph/db/sql_store.go b/graph/db/sql_store.go index 71f9d083a..5e358d304 100644 --- a/graph/db/sql_store.go +++ b/graph/db/sql_store.go @@ -2244,10 +2244,8 @@ func (s *SQLStore) FetchChannelEdgesByOutpoint(ctx context.Context, // result is returned as the second boolean. // // NOTE: part of the Store interface. -func (s *SQLStore) HasV1ChannelEdge(chanID uint64) (time.Time, time.Time, bool, - bool, error) { - - ctx := context.TODO() +func (s *SQLStore) HasV1ChannelEdge(ctx context.Context, + chanID uint64) (time.Time, time.Time, bool, bool, error) { var ( exists bool