Merge pull request #10066 from ellemouton/graphFixMergeIssue

graph/db: fix sql test compilation

graph/db/graph_test.go

@@ -4350,15 +4350,6 @@ func TestGraphLoading(t *testing.T) {
 	// Next, create the graph for the first time.
 	graphStore := NewTestDB(t)
 
-	// Temporarily add a manual skip for this test, until all the methods
-	// it uses have been implemented on the SQLStore struct. We have to
-	// manually add this skip because it is the only test that doesn't use
-	// the MakeTestGraph helper to create the graph store.
-	_, ok := graphStore.(*KVStore)
-	if !ok {
-		t.Skipf("Skipping TestGraphLoading for non-bbolt graph store")
-	}
-
 	graph, err := NewChannelGraph(graphStore)
 	require.NoError(t, err)
 	require.NoError(t, graph.Start())

graph/db/sql_migration_test.go

@@ -345,8 +345,9 @@ func (c chanSet) CountPolicies() int {
 // fetchAllChannelsAndPolicies retrieves all channels and their policies
 // from the given store and returns them sorted by their channel ID.
 func fetchAllChannelsAndPolicies(t *testing.T, store V1Store) chanSet {
+	ctx := context.Background()
 	channels := make(chanSet, 0)
-	err := store.ForEachChannel(func(info *models.ChannelEdgeInfo,
+	err := store.ForEachChannel(ctx, func(info *models.ChannelEdgeInfo,
 		p1 *models.ChannelEdgePolicy,
 		p2 *models.ChannelEdgePolicy) error {