sectorstorage: Untangle from lotus deps

node/impl/client/client.go

@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"errors"
+	"github.com/filecoin-project/lotus/storage/sectorstorage/ffiwrapper"
 	"io"
 	"os"
 
@@ -83,7 +84,7 @@ func (a *API) ClientStartDeal(ctx context.Context, params *api.StartDealParams)
 		return nil, xerrors.Errorf("failed checking miners sector size: %w", err)
 	}
 
-	rt, _, err := api.ProofTypeFromSectorSize(ssize)
+	rt, _, err := ffiwrapper.ProofTypeFromSectorSize(ssize)
 	if err != nil {
 		return nil, xerrors.Errorf("bad sector size: %w", err)
 	}

node/impl/remoteworker.go

@@ -0,0 +1,53 @@
+package impl
+
+import (
+	"context"
+	"net/http"
+
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/specs-actors/actors/abi"
+	storage2 "github.com/filecoin-project/specs-storage/storage"
+
+	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/api/client"
+	"github.com/filecoin-project/lotus/lib/jsonrpc"
+	"github.com/filecoin-project/lotus/storage/sectorstorage"
+)
+
+type remoteWorker struct {
+	api.WorkerApi
+	closer jsonrpc.ClientCloser
+}
+
+func (r *remoteWorker) NewSector(ctx context.Context, sector abi.SectorID) error {
+	return xerrors.New("unsupported")
+}
+
+func (r *remoteWorker) AddPiece(ctx context.Context, sector abi.SectorID, pieceSizes []abi.UnpaddedPieceSize, newPieceSize abi.UnpaddedPieceSize, pieceData storage2.Data) (abi.PieceInfo, error) {
+	return abi.PieceInfo{}, xerrors.New("unsupported")
+}
+
+func connectRemoteWorker(ctx context.Context, fa api.Common, url string) (*remoteWorker, error) {
+	token, err := fa.AuthNew(ctx, []api.Permission{"admin"})
+	if err != nil {
+		return nil, xerrors.Errorf("creating auth token for remote connection: %w", err)
+	}
+
+	headers := http.Header{}
+	headers.Add("Authorization", "Bearer "+string(token))
+
+	wapi, closer, err := client.NewWorkerRPC(url, headers)
+	if err != nil {
+		return nil, xerrors.Errorf("creating jsonrpc client: %w", err)
+	}
+
+	return &remoteWorker{wapi, closer}, nil
+}
+
+func (r *remoteWorker) Close() error {
+	r.closer()
+	return nil
+}
+
+var _ sectorstorage.Worker = &remoteWorker{}

node/impl/storminer.go

@@ -50,7 +50,7 @@ func (sm *StorageMinerAPI) ServeRemote(w http.ResponseWriter, r *http.Request) {
 	sm.StorageMgr.ServeHTTP(w, r)
 }
 
-func (sm *StorageMinerAPI) WorkerStats(context.Context) (map[uint64]api.WorkerStats, error) {
+func (sm *StorageMinerAPI) WorkerStats(context.Context) (map[uint64]sectorstorage.WorkerStats, error) {
 	return sm.StorageMgr.WorkerStats(), nil
 }
 
@@ -149,7 +149,7 @@ func (sm *StorageMinerAPI) SectorsUpdate(ctx context.Context, id abi.SectorNumbe
 }
 
 func (sm *StorageMinerAPI) WorkerConnect(ctx context.Context, url string) error {
-	w, err := sectorstorage.ConnectRemote(ctx, sm, url)
+	w, err := connectRemoteWorker(ctx, sm, url)
 	if err != nil {
 		return xerrors.Errorf("connecting remote storage failed: %w", err)
 	}