workers: Basic Remote store

cmd/lotus-seal-worker/main.go

@@ -4,7 +4,6 @@ import (
 	"os"
 
 	logging "github.com/ipfs/go-log/v2"
-	manet "github.com/multiformats/go-multiaddr-net"
 	"golang.org/x/xerrors"
 	"gopkg.in/urfave/cli.v2"
 
@@ -118,47 +117,7 @@ var runCmd = &cli.Command{
 			return xerrors.Errorf("get params: %w", err)
 		}
 
-		ainfo, err := lcli.GetAPIInfo(cctx, repo.StorageMiner)
-		if err != nil {
-			return xerrors.Errorf("could not get api info: %w", err)
-		}
-		_, storageAddr, err := manet.DialArgs(ainfo.Addr)
 
-
-
-		/*
-		/*ppt, spt, err := api.ProofTypeFromSectorSize(ssize)
-			if err != nil {
-				return err
-			}
-
-			/*sb, err := sectorbuilder.NewStandalone(&sectorbuilder.Config{
-				SealProofType: spt,
-				PoStProofType: ppt,
-				Miner:         act,
-				WorkerThreads: workers,
-				Paths:         sectorbuilder.SimplePath(r),
-			})
-			if err != nil {
-				return err
-			}
-
-			nQueues := workers + transfers
-			var wg sync.WaitGroup
-			wg.Add(nQueues)
-
-			for i := 0; i < nQueues; i++ {
-				go func() {
-					defer wg.Done()
-
-				/*	if err := acceptJobs(ctx, nodeApi, sb, limiter, "http://"+storageAddr, ainfo.AuthHeader(), r, cctx.Bool("no-precommit"), cctx.Bool("no-commit")); err != nil {
-						log.Warnf("%+v", err)
-						return
-					}
-				}()
-			}
-
-			wg.Wait()*/
 		return nil
 	},
 }

cmd/lotus-seal-worker/rpc.go

@@ -1,13 +1,12 @@
 package main
 
 import (
+	"github.com/filecoin-project/lotus/storage/sealmgr/advmgr"
 	"github.com/filecoin-project/specs-storage/storage"
-
-	"github.com/filecoin-project/go-sectorbuilder"
 )
 
 type worker struct { // TODO: use advmgr.LocalWorker here
-	sectorbuilder.Basic
+	*advmgr.LocalWorker
 }
 
 var _ storage.Sealer = &worker{}

cmd/lotus-seal-worker/storage.go

@@ -1,53 +0,0 @@
-package main
-
-import (
-	"context"
-	"net/http"
-	"sort"
-
-	"github.com/filecoin-project/specs-actors/actors/abi"
-	"github.com/filecoin-project/go-sectorbuilder"
-	"github.com/filecoin-project/lotus/storage/sealmgr/stores"
-
-	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/storage/sealmgr/sectorutil"
-)
-
-type workerStorage struct {
-	path string // TODO: multi-path support
-	mid abi.ActorID // ewwhh TODO: passthru in sectobuilder/ffi
-
-	local *stores.Local
-	auth http.Header
-	api api.StorageMiner
-}
-
-func (w *workerStorage) AcquireSector(ctx context.Context, id abi.SectorNumber, existing sectorbuilder.SectorFileType, allocate sectorbuilder.SectorFileType, sealing bool) (sectorbuilder.SectorPaths, func(), error) {
-	asid := abi.SectorID{
-		Miner:  w.mid,
-		Number: id,
-	}
-
-	// extract local storage; prefer
-
-
-	si, err := w.api.WorkerFindSector(ctx, asid, existing)
-	if err != nil {
-		return sectorbuilder.SectorPaths{}, nil, err
-	}
-
-	sort.Slice(si, func(i, j int) bool {
-		return si[i].Cost < si[j].Cost
-	})
-
-	best := si[0].URLs // TODO: not necessarily true
-
-	sname := sectorutil.SectorName(abi.SectorID{
-		Miner:  w.mid,
-		Number: id,
-	})
-
-	w.fetch(best, )
-}
-
-var _ sectorbuilder.SectorProvider = &workerStorage{}

cmd/lotus-seal-worker/transfer.go

@@ -1,62 +0,0 @@
-package main
-
-
-import (
-	"mime"
-	"net/http"
-	"os"
-
-	files "github.com/ipfs/go-ipfs-files"
-	"golang.org/x/xerrors"
-
-	"github.com/filecoin-project/lotus/lib/tarutil"
-)
-
-func (w *workerStorage) fetch(url, outname string) error {
-	log.Infof("Fetch %s", url)
-
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return xerrors.Errorf("request: %w", err)
-	}
-	req.Header = w.auth
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return xerrors.Errorf("do request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		return xerrors.Errorf("non-200 code: %d", resp.StatusCode)
-	}
-
-	/*bar := pb.New64(w.sizeForType(typ))
-	bar.ShowPercent = true
-	bar.ShowSpeed = true
-	bar.Units = pb.U_BYTES
-
-	barreader := bar.NewProxyReader(resp.Body)
-
-	bar.Start()
-	defer bar.Finish()*/
-
-	mediatype, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
-	if err != nil {
-		return xerrors.Errorf("parse media type: %w", err)
-	}
-
-	if err := os.RemoveAll(outname); err != nil {
-		return xerrors.Errorf("removing dest: %w", err)
-	}
-
-	switch mediatype {
-	case "application/x-tar":
-		return tarutil.ExtractTar(resp.Body, outname)
-	case "application/octet-stream":
-		return files.WriteTo(files.NewReaderFile(resp.Body), outname)
-	default:
-		return xerrors.Errorf("unknown content type: '%s'", mediatype)
-	}
-
-}