miner: Create miner in DI

node/builder.go

@@ -24,6 +24,7 @@ import (
 	"github.com/filecoin-project/go-lotus/chain/types"
 	"github.com/filecoin-project/go-lotus/chain/wallet"
 	"github.com/filecoin-project/go-lotus/lib/sectorbuilder"
+	"github.com/filecoin-project/go-lotus/miner"
 	"github.com/filecoin-project/go-lotus/node/config"
 	"github.com/filecoin-project/go-lotus/node/hello"
 	"github.com/filecoin-project/go-lotus/node/impl"
@@ -222,6 +223,8 @@ func Online() Option {
 
 			Override(new(*paych.Store), modules.PaychStore),
 			Override(new(*paych.Manager), modules.PaymentChannelManager),
+
+			Override(new(*miner.Miner), miner.NewMiner),
 		),
 
 		// Storage miner
@@ -309,7 +312,7 @@ func Repo(r repo.Repo) Option {
 
 func FullAPI(out *api.FullNode) Option {
 	return func(s *Settings) error {
-		resAPI := &impl.FullNodeAPI{}
+		resAPI := &impl.API{}
 		s.invokes[ExtractApiKey] = fx.Extract(resAPI)
 		*out = resAPI
 		return nil

node/client/import.go

@@ -1,93 +1 @@
 package client
-
-import (
-	"context"
-	"errors"
-	"os"
-
-	"github.com/filecoin-project/go-lotus/api"
-	"github.com/filecoin-project/go-lotus/node/modules/dtypes"
-
-	"github.com/ipfs/go-filestore"
-	"go.uber.org/fx"
-
-	"github.com/ipfs/go-cid"
-	chunker "github.com/ipfs/go-ipfs-chunker"
-	files "github.com/ipfs/go-ipfs-files"
-	ipld "github.com/ipfs/go-ipld-format"
-	"github.com/ipfs/go-unixfs/importer/balanced"
-	ihelper "github.com/ipfs/go-unixfs/importer/helpers"
-)
-
-type LocalStorage struct {
-	fx.In
-
-	LocalDAG  dtypes.ClientDAG
-	Filestore dtypes.ClientFilestore `optional:"true"`
-}
-
-func (s *LocalStorage) ClientImport(ctx context.Context, path string) (cid.Cid, error) {
-	f, err := os.Open(path)
-	if err != nil {
-		return cid.Undef, err
-	}
-	stat, err := f.Stat()
-	if err != nil {
-		return cid.Undef, err
-	}
-
-	file, err := files.NewReaderPathFile(path, f, stat)
-	if err != nil {
-		return cid.Undef, err
-	}
-
-	bufferedDS := ipld.NewBufferedDAG(ctx, s.LocalDAG)
-
-	params := ihelper.DagBuilderParams{
-		Maxlinks:   ihelper.DefaultLinksPerBlock,
-		RawLeaves:  true,
-		CidBuilder: nil,
-		Dagserv:    bufferedDS,
-		NoCopy:     true,
-	}
-
-	db, err := params.New(chunker.DefaultSplitter(file))
-	if err != nil {
-		return cid.Undef, err
-	}
-	nd, err := balanced.Layout(db)
-	if err != nil {
-		return cid.Undef, err
-	}
-
-	return nd.Cid(), bufferedDS.Commit()
-}
-
-func (s *LocalStorage) ClientListImports(ctx context.Context) ([]api.Import, error) {
-	if s.Filestore == nil {
-		return nil, errors.New("listing imports is not supported with in-memory dag yet")
-	}
-	next, err := filestore.ListAll(s.Filestore, false)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: make this less very bad by tracking root cids instead of using ListAll
-
-	out := make([]api.Import, 0)
-	for {
-		r := next()
-		if r == nil {
-			return out, nil
-		}
-		if r.Offset != 0 {
-			continue
-		}
-		out = append(out, api.Import{
-			Status:   r.Status,
-			Key:      r.Key,
-			FilePath: r.FilePath,
-			Size:     r.Size,
-		})
-	}
-}