cleanup itest fixtures, fix gql

Author: LexLuthr

extern/filecoin-ffi

@@ -27,15 +27,15 @@ import (
 	"go.uber.org/fx"
 )
 
-func NewGraphqlServer(cfg *config.Boost) func(lc fx.Lifecycle, r repo.LockedRepo, h host.Host, prov *storagemarket.Provider, dealsDB *db.DealsDB, logsDB *db.LogsDB, retDB *rtvllog.RetrievalLogDB, plDB *db.ProposalLogsDB, fundsDB *db.FundsDB, fundMgr *fundmanager.FundManager, storageMgr *storagemanager.StorageManager, publisher *storageadapter.DealPublisher, spApi sealingpipeline.API, legacyDeals legacy.LegacyDealManager, piecedirectory *piecedirectory.PieceDirectory, indexProv provider.Interface, idxProvWrapper *indexprovider.Wrapper, fullNode v1api.FullNode, bg BlockGetter, ssm *sectorstatemgr.SectorStateMgr, mpool *mpoolmonitor.MpoolMonitor, mma *lib.MultiMinerAccessor, sask storedask.StoredAsk) *Server {
-	return func(lc fx.Lifecycle, r repo.LockedRepo, h host.Host, prov *storagemarket.Provider, dealsDB *db.DealsDB, logsDB *db.LogsDB, retDB *rtvllog.RetrievalLogDB, plDB *db.ProposalLogsDB, fundsDB *db.FundsDB, fundMgr *fundmanager.FundManager,
+func NewGraphqlServer(cfg *config.Boost) func(lc fx.Lifecycle, r repo.LockedRepo, h host.Host, prov *storagemarket.Provider, ddProv *storagemarket.DirectDealsProvider, dealsDB *db.DealsDB, directDealsDB *db.DirectDealsDB, logsDB *db.LogsDB, retDB *rtvllog.RetrievalLogDB, plDB *db.ProposalLogsDB, fundsDB *db.FundsDB, fundMgr *fundmanager.FundManager, storageMgr *storagemanager.StorageManager, publisher *storageadapter.DealPublisher, spApi sealingpipeline.API, legacyDeals legacy.LegacyDealManager, piecedirectory *piecedirectory.PieceDirectory, indexProv provider.Interface, idxProvWrapper *indexprovider.Wrapper, fullNode v1api.FullNode, bg BlockGetter, ssm *sectorstatemgr.SectorStateMgr, mpool *mpoolmonitor.MpoolMonitor, mma *lib.MultiMinerAccessor, sask storedask.StoredAsk) *Server {
+	return func(lc fx.Lifecycle, r repo.LockedRepo, h host.Host, prov *storagemarket.Provider, ddProv *storagemarket.DirectDealsProvider, dealsDB *db.DealsDB, directDealsDB *db.DirectDealsDB, logsDB *db.LogsDB, retDB *rtvllog.RetrievalLogDB, plDB *db.ProposalLogsDB, fundsDB *db.FundsDB, fundMgr *fundmanager.FundManager,
 		storageMgr *storagemanager.StorageManager, publisher *storageadapter.DealPublisher, spApi sealingpipeline.API,
 		legacyDeals legacy.LegacyDealManager, piecedirectory *piecedirectory.PieceDirectory,
 		indexProv provider.Interface, idxProvWrapper *indexprovider.Wrapper, fullNode v1api.FullNode, bg BlockGetter,
 		ssm *sectorstatemgr.SectorStateMgr, mpool *mpoolmonitor.MpoolMonitor, mma *lib.MultiMinerAccessor, sask storedask.StoredAsk) *Server {
 
 		resolverCtx, cancel := context.WithCancel(context.Background())
-		resolver := NewResolver(resolverCtx, cfg, r, h, dealsDB, logsDB, retDB, plDB, fundsDB, fundMgr, storageMgr, spApi, prov, legacyDeals, piecedirectory, publisher, indexProv, idxProvWrapper, fullNode, ssm, mpool, mma, sask)
+		resolver := NewResolver(resolverCtx, cfg, r, h, dealsDB, directDealsDB, logsDB, retDB, plDB, fundsDB, fundMgr, storageMgr, spApi, prov, ddProv, legacyDeals, piecedirectory, publisher, indexProv, idxProvWrapper, fullNode, ssm, mpool, mma, sask)
 		svr := NewServer(cfg, resolver, bg)
 
 		lc.Append(fx.Hook{

gql/module.go

@@ -13,6 +13,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
 	carv2 "github.com/ipld/go-car/v2"
+	trustlessutils "github.com/ipld/go-trustless-utils"
 	"github.com/stretchr/testify/require"
 )
 
@@ -39,21 +40,6 @@ func TestDataSegmentIndexRetrieval(t *testing.T) {
 	err = f.AddClientProviderBalance(abi.NewTokenAmount(1e15))
 	require.NoError(t, err)
 
-	//// Create a CAR file
-	//tempdir := t.TempDir()
-	//log.Debugw("using tempdir", "dir", tempdir)
-	//
-	//// Select the number of car segments to use in test
-	//seg := 2
-	//
-	//// Generate car file containing multiple car files
-	//segmentDetails, err := framework.GenerateDataSegmentFiles(t, tempdir, seg)
-	//require.NoError(t, err)
-	//
-	//p := segmentDetails.Piece.PieceCID.String()
-	//
-	//log.Info(p)
-
 	// Start a web server to serve the car files
 	log.Debug("starting webserver")
 	server, err := testutil.HttpTestFileServer(t, "fixtures")
@@ -78,27 +64,19 @@ func TestDataSegmentIndexRetrieval(t *testing.T) {
 	err = f.WaitForDealAddedToSector(dealUuid)
 	require.NoError(t, err)
 
-	////Retrieve and compare the all car files within the deal
-	//for i := 0; i < seg; i++ {
-	//	for _, r := range segmentDetails.Segments[i].Root {
-	//		outFile := f.RetrieveDirect(ctx, t, r, &res.DealParams.ClientDealProposal.Proposal.PieceCID, true)
-	//		kit.AssertFilesEqual(t, segmentDetails.Segments[i].FilePath, outFile)
-	//	}
-	//}
-
 	r1, err := cid.Parse("bafykbzaceaqliwrg6y2bxrhhbbiz3nknhz43yj2bqog4rulu5km5qhkckffuw")
 	require.NoError(t, err)
 	r2, err := cid.Parse("bafykbzaceccq64xf6yadlbmqpfindtf5x3cssel2fozkhvdyrrtnjnutr5j52")
 	require.NoError(t, err)
 
-	outF1 := f.RetrieveDirect(ctx, t, r1, &pieceCid, false, nil)
+	outF1 := f.Retrieve(ctx, t, trustlessutils.Request{Root: r1, Scope: trustlessutils.DagScopeAll}, false)
 	r, err := carv2.OpenReader(outF1)
 	require.NoError(t, err)
 	rs, err := r.Roots()
 	require.NoError(t, err)
 	require.Equal(t, r1, rs[0])
 	r.Close()
-	outf2 := f.RetrieveDirect(ctx, t, r2, &pieceCid, false, nil)
+	outf2 := f.Retrieve(ctx, t, trustlessutils.Request{Root: r2, Scope: trustlessutils.DagScopeAll}, false)
 	r, err = carv2.OpenReader(outf2)
 	require.NoError(t, err)
 	rs, err = r.Roots()