cerc-io/lotus
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Cleanup after dropping sectorbuilder

Browse Source
This commit is contained in:
Łukasz Magiera
2020-03-26 20:35:16 +01:00
parent 4be54a976c
commit e050e0307e
27 changed files with 221 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node/builder.go
+2 -2
View File
@@ -3,7 +3,6 @@ package node
import (
"context"
"errors"
"github.com/filecoin-project/lotus/storage/sectorstorage/ffiwrapper"
"time"
blockstore "github.com/ipfs/go-ipfs-blockstore"
@@ -61,6 +60,7 @@ import (
"github.com/filecoin-project/lotus/storage/sealing"
"github.com/filecoin-project/lotus/storage/sectorblocks"
"github.com/filecoin-project/lotus/storage/sectorstorage"
"github.com/filecoin-project/lotus/storage/sectorstorage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sectorstorage/stores"
)
@@ -268,7 +268,7 @@ func Online() Option {
Override(new(stores.SectorIndex), From(new(*stores.Index))),
Override(new(dtypes.MinerID), modules.MinerID),
Override(new(dtypes.MinerAddress), modules.MinerAddress),
Override(new(*ffiwrapper.Config), modules.SectorBuilderConfig),
Override(new(*ffiwrapper.Config), modules.ProofsConfig),
Override(new(stores.LocalStorage), From(new(repo.LockedRepo))),
Override(new(sealing.SectorIDCounter), modules.SectorIDCounter),
Override(new(*sectorstorage.Manager), modules.SectorStorage),
node/impl/storminer.go
+2 -3
View File
@@ -3,7 +3,6 @@ package impl
import (
"context"
"encoding/json"
"github.com/filecoin-project/lotus/storage/sectorstorage/ffiwrapper"
"net/http"
"os"
"strconv"
@@ -23,14 +22,14 @@ import (
"github.com/filecoin-project/lotus/storage"
"github.com/filecoin-project/lotus/storage/sectorblocks"
"github.com/filecoin-project/lotus/storage/sectorstorage"
"github.com/filecoin-project/lotus/storage/sectorstorage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sectorstorage/stores"
)
type StorageMinerAPI struct {
common.CommonAPI
SectorBuilderConfig *ffiwrapper.Config
//SectorBuilder sectorbuilder.Interface
ProofsConfig *ffiwrapper.Config
SectorBlocks *sectorblocks.SectorBlocks
StorageProvider storagemarket.StorageProvider
node/modules/storageminer.go
+2 -2
View File
@@ -2,7 +2,6 @@ package modules
import (
"context"
"github.com/filecoin-project/lotus/storage/sectorstorage/ffiwrapper"
"reflect"
"github.com/ipfs/go-bitswap"
@@ -51,6 +50,7 @@ import (
"github.com/filecoin-project/lotus/storage"
"github.com/filecoin-project/lotus/storage/sealing"
"github.com/filecoin-project/lotus/storage/sectorstorage"
"github.com/filecoin-project/lotus/storage/sectorstorage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sectorstorage/stores"
)
@@ -86,7 +86,7 @@ func MinerID(ma dtypes.MinerAddress) (dtypes.MinerID, error) {
return dtypes.MinerID(id), err
}
func SectorBuilderConfig(maddr dtypes.MinerAddress, fnapi lapi.FullNode) (*ffiwrapper.Config, error) {
func ProofsConfig(maddr dtypes.MinerAddress, fnapi lapi.FullNode) (*ffiwrapper.Config, error) {
ssize, err := fnapi.StateMinerSectorSize(context.TODO(), address.Address(maddr), types.EmptyTSK)
if err != nil {
return nil, err