Wire up client import manager

node/modules/client.go

@@ -2,12 +2,9 @@ package modules
 
 import (
 	"context"
-	"path/filepath"
 
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	"github.com/ipfs/go-merkledag"
 	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/routing"
 	"go.uber.org/fx"
 
 	graphsyncimpl "github.com/filecoin-project/go-data-transfer/impl/graphsync"
@@ -21,18 +18,13 @@ import (
 	smnet "github.com/filecoin-project/go-fil-markets/storagemarket/network"
 	"github.com/filecoin-project/go-statestore"
 	"github.com/filecoin-project/go-storedcounter"
-	"github.com/ipfs/go-bitswap"
-	"github.com/ipfs/go-bitswap/network"
-	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/namespace"
-	"github.com/ipfs/go-filestore"
 
 	"github.com/filecoin-project/lotus/markets/retrievaladapter"
 	"github.com/filecoin-project/lotus/node/impl/full"
 	payapi "github.com/filecoin-project/lotus/node/impl/paych"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
-	"github.com/filecoin-project/lotus/node/modules/helpers"
 	"github.com/filecoin-project/lotus/node/repo"
 	"github.com/filecoin-project/lotus/node/repo/importmgr"
 	"github.com/filecoin-project/lotus/paychmgr"
@@ -53,28 +45,12 @@ func ClientMultiDatastore(lc fx.Lifecycle, r repo.LockedRepo) (dtypes.ClientMult
 	return mds, nil
 }
 
-func ClientFstore(r repo.LockedRepo) (dtypes.ClientFilestore, error) {
-	clientds, err := r.Datastore("/client")
-	if err != nil {
-		return nil, err
-	}
-	blocks := namespace.Wrap(clientds, datastore.NewKey("blocks"))
-
-	absPath, err := filepath.Abs(r.Path())
-	if err != nil {
-		return nil, err
-	}
-
-	fm := filestore.NewFileManager(clientds, filepath.Dir(absPath))
-	fm.AllowFiles = true
-	// TODO: fm.AllowUrls (needs more code in client import)
-
-	bs := blockstore.NewBlockstore(blocks)
-	return filestore.NewFilestore(bs, fm), nil
+func ClientImportMgr(mds dtypes.ClientMultiDstore, ds dtypes.MetadataDS) dtypes.ClientImportMgr {
+	return importmgr.New(mds, namespace.Wrap(ds, datastore.NewKey("/client")))
 }
 
-func ClientBlockstore(fstore dtypes.ClientFilestore) dtypes.ClientBlockstore {
-	return blockstore.NewIdStore((*filestore.Filestore)(fstore))
+func ClientBlockstore(imgr dtypes.ClientImportMgr) dtypes.ClientBlockstore {
+	return blockstore.NewIdStore(imgr.Blockstore)
 }
 
 // RegisterClientValidator is an initialization hook that registers the client
@@ -103,24 +79,6 @@ func NewClientDatastore(ds dtypes.MetadataDS) dtypes.ClientDatastore {
 	return namespace.Wrap(ds, datastore.NewKey("/deals/client"))
 }
 
-// ClientDAG is a DAGService for the ClientBlockstore
-func ClientDAG(mctx helpers.MetricsCtx, lc fx.Lifecycle, ibs dtypes.ClientBlockstore, rt routing.Routing, h host.Host) dtypes.ClientDAG {
-	bitswapNetwork := network.NewFromIpfsHost(h, rt)
-	bitswapOptions := []bitswap.Option{bitswap.ProvideEnabled(false)}
-	exch := bitswap.New(helpers.LifecycleCtx(mctx, lc), bitswapNetwork, ibs, bitswapOptions...)
-
-	bsvc := blockservice.New(ibs, exch)
-	dag := merkledag.NewDAGService(bsvc)
-
-	lc.Append(fx.Hook{
-		OnStop: func(_ context.Context) error {
-			return bsvc.Close()
-		},
-	})
-
-	return dag
-}
-
 func NewClientRequestValidator(deals dtypes.ClientDealStore) dtypes.ClientRequestValidator {
 	return requestvalidation.NewUnifiedRequestValidator(nil, deals)
 }

node/modules/dtypes/storage.go

@@ -3,7 +3,6 @@ package dtypes
 import (
 	bserv "github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-datastore"
-	"github.com/ipfs/go-filestore"
 	"github.com/ipfs/go-graphsync"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	exchange "github.com/ipfs/go-ipfs-exchange-interface"
@@ -29,7 +28,7 @@ type ChainExchange exchange.Interface
 type ChainBlockService bserv.BlockService
 
 type ClientMultiDstore *importmgr.MultiStore
-type ClientFilestore *filestore.Filestore
+type ClientImportMgr *importmgr.Mgr
 type ClientBlockstore blockstore.Blockstore
 type ClientDealStore *statestore.StateStore
 type ClientRequestValidator *requestvalidation.UnifiedRequestValidator

node/modules/ipfsclient.go

@@ -4,7 +4,6 @@ import (
 	"go.uber.org/fx"
 	"golang.org/x/xerrors"
 
-	"github.com/ipfs/go-filestore"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	"github.com/multiformats/go-multiaddr"
 
@@ -18,8 +17,8 @@ import (
 // If ipfsMaddr is empty, a local IPFS node is assumed considering IPFS_PATH configuration.
 // If ipfsMaddr is not empty, it will connect to the remote IPFS node with the provided multiaddress.
 // The flag useForRetrieval indicates if the IPFS node will also be used for storing retrieving deals.
-func IpfsClientBlockstore(ipfsMaddr string, useForRetrieval bool) func(helpers.MetricsCtx, fx.Lifecycle, dtypes.ClientFilestore) (dtypes.ClientBlockstore, error) {
-	return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, fstore dtypes.ClientFilestore) (dtypes.ClientBlockstore, error) {
+func IpfsClientBlockstore(ipfsMaddr string, useForRetrieval bool) func(helpers.MetricsCtx, fx.Lifecycle, dtypes.ClientImportMgr) (dtypes.ClientBlockstore, error) {
+	return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, localStore dtypes.ClientImportMgr) (dtypes.ClientBlockstore, error) {
 		var err error
 		var ipfsbs *ipfsbstore.IpfsBstore
 		if ipfsMaddr != "" {
@@ -38,7 +37,7 @@ func IpfsClientBlockstore(ipfsMaddr string, useForRetrieval bool) func(helpers.M
 		var ws blockstore.Blockstore
 		ws = ipfsbs
 		if !useForRetrieval {
-			ws = blockstore.NewIdStore((*filestore.Filestore)(fstore))
+			ws = blockstore.NewIdStore(localStore.Blockstore)
 		}
 		return bufbstore.NewTieredBstore(ipfsbs, ws), nil
 	}