sectorstorage: Untangle from lotus deps

node/repo/fsrepo.go

@@ -3,6 +3,7 @@ package repo
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/filecoin-project/lotus/storage/sectorstorage/stores"
 	"io"
 	"io/ioutil"
 	"os"
@@ -282,26 +283,26 @@ func (fsr *fsLockedRepo) Config() (interface{}, error) {
 	return config.FromFile(fsr.join(fsConfig), defConfForType(fsr.repoType))
 }
 
-func (fsr *fsLockedRepo) GetStorage() (config.StorageConfig, error) {
+func (fsr *fsLockedRepo) GetStorage() (stores.StorageConfig, error) {
 	fsr.storageLk.Lock()
 	defer fsr.storageLk.Unlock()
 
 	return fsr.getStorage(nil)
 }
 
-func (fsr *fsLockedRepo) getStorage(def *config.StorageConfig) (config.StorageConfig, error) {
+func (fsr *fsLockedRepo) getStorage(def *stores.StorageConfig) (stores.StorageConfig, error) {
 	c, err := config.StorageFromFile(fsr.join(fsStorageConfig), def)
 	if err != nil {
-		return config.StorageConfig{}, err
+		return stores.StorageConfig{}, err
 	}
 	return *c, nil
 }
 
-func (fsr *fsLockedRepo) SetStorage(c func(*config.StorageConfig)) error {
+func (fsr *fsLockedRepo) SetStorage(c func(*stores.StorageConfig)) error {
 	fsr.storageLk.Lock()
 	defer fsr.storageLk.Unlock()
 
-	sc, err := fsr.getStorage(&config.StorageConfig{})
+	sc, err := fsr.getStorage(&stores.StorageConfig{})
 	if err != nil {
 		return xerrors.Errorf("get storage: %w", err)
 	}

node/repo/interface.go

@@ -2,12 +2,12 @@ package repo
 
 import (
 	"errors"
+	"github.com/filecoin-project/lotus/storage/sectorstorage/stores"
 
 	"github.com/ipfs/go-datastore"
 	"github.com/multiformats/go-multiaddr"
 
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/node/config"
 )
 
 var (
@@ -38,8 +38,8 @@ type LockedRepo interface {
 	// Returns config in this repo
 	Config() (interface{}, error)
 
-	GetStorage() (config.StorageConfig, error)
-	SetStorage(func(*config.StorageConfig)) error
+	GetStorage() (stores.StorageConfig, error)
+	SetStorage(func(*stores.StorageConfig)) error
 
 	// SetAPIEndpoint sets the endpoint of the current API
 	// so it can be read by API clients

node/repo/memrepo.go

@@ -41,12 +41,12 @@ type lockedMemRepo struct {
 
 	tempDir string
 	token   *byte
-	sc      *config.StorageConfig
+	sc      *stores.StorageConfig
 }
 
-func (lmem *lockedMemRepo) GetStorage() (config.StorageConfig, error) {
+func (lmem *lockedMemRepo) GetStorage() (stores.StorageConfig, error) {
 	if lmem.sc == nil {
-		lmem.sc = &config.StorageConfig{StoragePaths: []config.LocalPath{
+		lmem.sc = &stores.StorageConfig{StoragePaths: []stores.LocalPath{
 			{Path: lmem.Path()},
 		}}
 	}
@@ -54,7 +54,7 @@ func (lmem *lockedMemRepo) GetStorage() (config.StorageConfig, error) {
 	return *lmem.sc, nil
 }
 
-func (lmem *lockedMemRepo) SetStorage(c func(*config.StorageConfig)) error {
+func (lmem *lockedMemRepo) SetStorage(c func(*stores.StorageConfig)) error {
 	_, _ = lmem.GetStorage()
 
 	c(lmem.sc)
@@ -75,8 +75,8 @@ func (lmem *lockedMemRepo) Path() string {
 	}
 
 	if lmem.t == StorageMiner {
-		if err := config.WriteStorageFile(filepath.Join(t, fsStorageConfig), config.StorageConfig{
-			StoragePaths: []config.LocalPath{
+		if err := config.WriteStorageFile(filepath.Join(t, fsStorageConfig), stores.StorageConfig{
+			StoragePaths: []stores.LocalPath{
 				{Path: t},
 			}}); err != nil {
 			panic(err)
@@ -220,7 +220,7 @@ func (lmem *lockedMemRepo) Config() (interface{}, error) {
 	return lmem.mem.configF(lmem.t), nil
 }
 
-func (lmem *lockedMemRepo) Storage() (config.StorageConfig, error) {
+func (lmem *lockedMemRepo) Storage() (stores.StorageConfig, error) {
 	panic("implement me")
 }