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

keep storage-fsm (renamed to storage-sealing) and sector-storage in extern.

Browse Source
This commit is contained in:
Raúl Kripalani 2020-08-17 14:26:18 +01:00
parent 4f6d01d2ea
commit efdc428d5d
133 changed files with 225 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/api_storage.go
View File

@ -12,9 +12,9 @@ import (
"github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/retrievalmarket"
"github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-fil-markets/storagemarket"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
) )

6
api/api_worker.go
View File

@ -6,9 +6,9 @@ import (
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/specs-storage/storage"

8
api/apistruct/struct.go
View File

@ -15,11 +15,11 @@ import (
"github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-fil-markets/storagemarket"
"github.com/filecoin-project/go-jsonrpc/auth" "github.com/filecoin-project/go-jsonrpc/auth"
"github.com/filecoin-project/go-multistore" "github.com/filecoin-project/go-multistore"
"github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/extern/sector-storage/storiface"
marketevents "github.com/filecoin-project/lotus/markets/loggers" marketevents "github.com/filecoin-project/lotus/markets/loggers"
"github.com/filecoin-project/lotus/storage/sector/fsutil"
"github.com/filecoin-project/lotus/storage/sector/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/abi/big" "github.com/filecoin-project/specs-actors/actors/abi/big"
"github.com/filecoin-project/specs-actors/actors/builtin/miner" "github.com/filecoin-project/specs-actors/actors/builtin/miner"

2
api/test/deals.go
View File

@ -22,8 +22,8 @@ import (
"github.com/filecoin-project/go-fil-markets/storagemarket" "github.com/filecoin-project/go-fil-markets/storagemarket"
"github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
"github.com/filecoin-project/lotus/extern/storage-sealing"
"github.com/filecoin-project/lotus/miner" "github.com/filecoin-project/lotus/miner"
"github.com/filecoin-project/lotus/storage/sealing"
dag "github.com/ipfs/go-merkledag" dag "github.com/ipfs/go-merkledag"
dstest "github.com/ipfs/go-merkledag/test" dstest "github.com/ipfs/go-merkledag/test"
unixfile "github.com/ipfs/go-unixfs/file" unixfile "github.com/ipfs/go-unixfs/file"

4
api/test/window_post.go
View File

@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/storage/sealing" "github.com/filecoin-project/lotus/extern/sector-storage/mock"
"github.com/filecoin-project/lotus/storage/sector/mock" "github.com/filecoin-project/lotus/extern/storage-sealing"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
miner2 "github.com/filecoin-project/specs-actors/actors/builtin/miner" miner2 "github.com/filecoin-project/specs-actors/actors/builtin/miner"

2
chain/gen/gen.go
View File

@ -34,11 +34,11 @@ import (
"github.com/filecoin-project/lotus/chain/vm" "github.com/filecoin-project/lotus/chain/vm"
"github.com/filecoin-project/lotus/chain/wallet" "github.com/filecoin-project/lotus/chain/wallet"
"github.com/filecoin-project/lotus/cmd/lotus-seed/seed" "github.com/filecoin-project/lotus/cmd/lotus-seed/seed"
"github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/genesis" "github.com/filecoin-project/lotus/genesis"
"github.com/filecoin-project/lotus/lib/blockstore" "github.com/filecoin-project/lotus/lib/blockstore"
"github.com/filecoin-project/lotus/lib/sigs" "github.com/filecoin-project/lotus/lib/sigs"
"github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/node/repo"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper"
) )
var log = logging.Logger("gen") var log = logging.Logger("gen")

2
chain/gen/genesis/miners.go
View File

@ -14,7 +14,7 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/abi/big" "github.com/filecoin-project/specs-actors/actors/abi/big"
"github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/specs-actors/actors/builtin"

2
chain/stmgr/utils.go
View File

@ -13,7 +13,7 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-bitfield"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/specs-actors/actors/builtin"
"github.com/filecoin-project/specs-actors/actors/builtin/account" "github.com/filecoin-project/specs-actors/actors/builtin/account"

2
chain/sync.go
View File

@ -24,7 +24,7 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/specs-actors/actors/builtin"
"github.com/filecoin-project/specs-actors/actors/builtin/power" "github.com/filecoin-project/specs-actors/actors/builtin/power"

2
chain/vm/syscalls.go
View File

@ -23,7 +23,7 @@ import (
"github.com/filecoin-project/specs-actors/actors/runtime" "github.com/filecoin-project/specs-actors/actors/runtime"
"github.com/filecoin-project/specs-actors/actors/util/adt" "github.com/filecoin-project/specs-actors/actors/util/adt"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
) )
func init() { func init() {

2
cmd/lotus-bench/import.go
View File

@ -25,7 +25,7 @@ import (
_ "github.com/filecoin-project/lotus/lib/sigs/bls" _ "github.com/filecoin-project/lotus/lib/sigs/bls"
_ "github.com/filecoin-project/lotus/lib/sigs/secp" _ "github.com/filecoin-project/lotus/lib/sigs/secp"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore"

6
cmd/lotus-bench/main.go
View File

@ -21,9 +21,9 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
paramfetch "github.com/filecoin-project/go-paramfetch" paramfetch "github.com/filecoin-project/go-paramfetch"
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper/basicfs" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper/basicfs"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/builtin/miner" "github.com/filecoin-project/specs-actors/actors/builtin/miner"
"github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/specs-storage/storage"

2
cmd/lotus-fountain/main.go
View File

@ -21,7 +21,7 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/abi/big" "github.com/filecoin-project/specs-actors/actors/abi/big"
"github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/specs-actors/actors/builtin"

10
cmd/lotus-seal-worker/main.go
View File

@ -22,18 +22,18 @@ import (
"github.com/filecoin-project/go-jsonrpc" "github.com/filecoin-project/go-jsonrpc"
"github.com/filecoin-project/go-jsonrpc/auth" "github.com/filecoin-project/go-jsonrpc/auth"
paramfetch "github.com/filecoin-project/go-paramfetch" paramfetch "github.com/filecoin-project/go-paramfetch"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper"
"github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/api/apistruct" "github.com/filecoin-project/lotus/api/apistruct"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"
"github.com/filecoin-project/lotus/extern/sector-storage"
"github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/lib/lotuslog" "github.com/filecoin-project/lotus/lib/lotuslog"
"github.com/filecoin-project/lotus/lib/rpcenc" "github.com/filecoin-project/lotus/lib/rpcenc"
"github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/node/repo"
"github.com/filecoin-project/lotus/storage/sector"
"github.com/filecoin-project/lotus/storage/sector/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores"
) )
var log = logging.Logger("main") var log = logging.Logger("main")
@ -336,7 +336,7 @@ var runCmd = &cli.Command{
// Create / expose the worker // Create / expose the worker
workerApi := &worker{ workerApi := &worker{
LocalWorker: sector.NewLocalWorker(sector.WorkerConfig{ LocalWorker: sectorstorage.NewLocalWorker(sectorstorage.WorkerConfig{
SealProof: spt, SealProof: spt,
TaskTypes: taskTypes, TaskTypes: taskTypes,
}, remote, localStore, nodeApi), }, remote, localStore, nodeApi),

4
cmd/lotus-seal-worker/rpc.go
View File

@ -5,13 +5,13 @@ import (
"github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/specs-storage/storage"
"github.com/filecoin-project/lotus/storage/sector" "github.com/filecoin-project/lotus/extern/sector-storage"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
) )
type worker struct { type worker struct {
*sector.LocalWorker *sectorstorage.LocalWorker
} }
func (w *worker) Version(context.Context) (build.Version, error) { func (w *worker) Version(context.Context) (build.Version, error) {

2
cmd/lotus-seed/main.go
View File

@ -8,7 +8,7 @@ import (
"os" "os"
"github.com/docker/go-units" "github.com/docker/go-units"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"

8
cmd/lotus-seed/seed/seed.go
View File

@ -19,7 +19,7 @@ import (
ffi "github.com/filecoin-project/filecoin-ffi" ffi "github.com/filecoin-project/filecoin-ffi"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/storage/sector/zerocomm" "github.com/filecoin-project/lotus/extern/sector-storage/zerocomm"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/abi/big" "github.com/filecoin-project/specs-actors/actors/abi/big"
"github.com/filecoin-project/specs-actors/actors/builtin/market" "github.com/filecoin-project/specs-actors/actors/builtin/market"
@ -27,10 +27,10 @@ import (
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/chain/wallet" "github.com/filecoin-project/lotus/chain/wallet"
"github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper/basicfs"
"github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/genesis" "github.com/filecoin-project/lotus/genesis"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper/basicfs"
"github.com/filecoin-project/lotus/storage/sector/stores"
) )
var log = logging.Logger("preseal") var log = logging.Logger("preseal")

2
cmd/lotus-storage-miner/info.go
View File

@ -11,7 +11,7 @@ import (
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/lotus/storage/sealing" "github.com/filecoin-project/lotus/extern/storage-sealing"
"github.com/filecoin-project/specs-actors/actors/builtin/miner" "github.com/filecoin-project/specs-actors/actors/builtin/miner"
"github.com/filecoin-project/specs-actors/actors/builtin/power" "github.com/filecoin-project/specs-actors/actors/builtin/power"

12
cmd/lotus-storage-miner/init.go
View File

@ -25,9 +25,9 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
cborutil "github.com/filecoin-project/go-cbor-util" cborutil "github.com/filecoin-project/go-cbor-util"
paramfetch "github.com/filecoin-project/go-paramfetch" paramfetch "github.com/filecoin-project/go-paramfetch"
"github.com/filecoin-project/lotus/storage/sector" "github.com/filecoin-project/lotus/extern/sector-storage"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/specs-actors/actors/builtin"
"github.com/filecoin-project/specs-actors/actors/builtin/market" "github.com/filecoin-project/specs-actors/actors/builtin/market"
@ -41,13 +41,13 @@ import (
"github.com/filecoin-project/lotus/chain/gen/slashfilter" "github.com/filecoin-project/lotus/chain/gen/slashfilter"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"
"github.com/filecoin-project/lotus/extern/storage-sealing"
"github.com/filecoin-project/lotus/genesis" "github.com/filecoin-project/lotus/genesis"
"github.com/filecoin-project/lotus/miner" "github.com/filecoin-project/lotus/miner"
"github.com/filecoin-project/lotus/node/modules" "github.com/filecoin-project/lotus/node/modules"
"github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/modules/dtypes"
"github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/node/repo"
"github.com/filecoin-project/lotus/storage" "github.com/filecoin-project/lotus/storage"
"github.com/filecoin-project/lotus/storage/sealing"
) )
var initCmd = &cli.Command{ var initCmd = &cli.Command{
@ -436,9 +436,9 @@ func storageMinerInit(ctx context.Context, cctx *cli.Context, api lapi.FullNode,
return err return err
} }
smgr, err := sector.New(ctx, lr, stores.NewIndex(), &ffiwrapper.Config{ smgr, err := sectorstorage.New(ctx, lr, stores.NewIndex(), &ffiwrapper.Config{
SealProofType: spt, SealProofType: spt,
}, sector.SealerConfig{ }, sectorstorage.SealerConfig{
ParallelFetchLimit: 10, ParallelFetchLimit: 10,
AllowPreCommit1: true, AllowPreCommit1: true,
AllowPreCommit2: true, AllowPreCommit2: true,

2
cmd/lotus-storage-miner/sealing.go
View File

@ -13,7 +13,7 @@ import (
"github.com/fatih/color" "github.com/fatih/color"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"

4
cmd/lotus-storage-miner/storage.go
View File

@ -18,8 +18,8 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"

2
cmd/lotus/daemon.go
View File

@ -30,6 +30,7 @@ import (
"github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/store"
"github.com/filecoin-project/lotus/chain/vm" "github.com/filecoin-project/lotus/chain/vm"
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"
"github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/lib/blockstore" "github.com/filecoin-project/lotus/lib/blockstore"
"github.com/filecoin-project/lotus/lib/peermgr" "github.com/filecoin-project/lotus/lib/peermgr"
"github.com/filecoin-project/lotus/lib/ulimit" "github.com/filecoin-project/lotus/lib/ulimit"
@ -39,7 +40,6 @@ import (
"github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/modules/dtypes"
"github.com/filecoin-project/lotus/node/modules/testing" "github.com/filecoin-project/lotus/node/modules/testing"
"github.com/filecoin-project/lotus/node/repo" "github.com/filecoin-project/lotus/node/repo"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper"
) )
const ( const (

0
storage/sector/README.md → extern/sector-storage/README.md vendored
View File

0
storage/sector/docs/sector-storage.svg → extern/sector-storage/docs/sector-storage.svg vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 75 KiB

4
storage/sector/faults.go → extern/sector-storage/faults.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -8,7 +8,7 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
) )

4
storage/sector/ffiwrapper/basicfs/fs.go → extern/sector-storage/ffiwrapper/basicfs/fs.go vendored
View File

@ -8,8 +8,8 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
type sectorFile struct { type sectorFile struct {

0
storage/sector/ffiwrapper/config.go → extern/sector-storage/ffiwrapper/config.go vendored
View File

0
storage/sector/ffiwrapper/files.go → extern/sector-storage/ffiwrapper/files.go vendored
View File

4
storage/sector/ffiwrapper/partialfile.go → extern/sector-storage/ffiwrapper/partialfile.go vendored
View File

@ -12,8 +12,8 @@ import (
rlepluslazy "github.com/filecoin-project/go-bitfield/rle" rlepluslazy "github.com/filecoin-project/go-bitfield/rle"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
const veryLargeRle = 1 << 20 const veryLargeRle = 1 << 20

0
storage/sector/ffiwrapper/sealer.go → extern/sector-storage/ffiwrapper/sealer.go vendored
View File

8
storage/sector/ffiwrapper/sealer_cgo.go → extern/sector-storage/ffiwrapper/sealer_cgo.go vendored
View File

@ -20,10 +20,10 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/specs-storage/storage"
"github.com/filecoin-project/lotus/storage/sector/fr32" "github.com/filecoin-project/lotus/extern/sector-storage/fr32"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
"github.com/filecoin-project/lotus/storage/sector/zerocomm" "github.com/filecoin-project/lotus/extern/sector-storage/zerocomm"
) )
var _ Storage = &Sealer{} var _ Storage = &Sealer{}

4
storage/sector/ffiwrapper/sealer_test.go → extern/sector-storage/ffiwrapper/sealer_test.go vendored
View File

@ -27,8 +27,8 @@ import (
ffi "github.com/filecoin-project/filecoin-ffi" ffi "github.com/filecoin-project/filecoin-ffi"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper/basicfs" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper/basicfs"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
) )
func init() { func init() {

6
storage/sector/ffiwrapper/types.go → extern/sector-storage/ffiwrapper/types.go vendored
View File

@ -9,9 +9,9 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/specs-storage/storage"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper/basicfs" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper/basicfs"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
type Validator interface { type Validator interface {

2
storage/sector/ffiwrapper/unseal_ranges.go → extern/sector-storage/ffiwrapper/unseal_ranges.go vendored
View File

@ -7,7 +7,7 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
// merge gaps between ranges which are close to each other // merge gaps between ranges which are close to each other

2
storage/sector/ffiwrapper/verifier_cgo.go → extern/sector-storage/ffiwrapper/verifier_cgo.go vendored
View File

@ -11,7 +11,7 @@ import (
ffi "github.com/filecoin-project/filecoin-ffi" ffi "github.com/filecoin-project/filecoin-ffi"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"go.opencensus.io/trace" "go.opencensus.io/trace"
) )

0
storage/sector/fr32/fr32.go → extern/sector-storage/fr32/fr32.go vendored
View File

4
storage/sector/fr32/fr32_ffi_cmp_test.go → extern/sector-storage/fr32/fr32_ffi_cmp_test.go vendored
View File

@ -7,8 +7,8 @@ import (
"os" "os"
"testing" "testing"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/fr32" "github.com/filecoin-project/lotus/extern/sector-storage/fr32"
ffi "github.com/filecoin-project/filecoin-ffi" ffi "github.com/filecoin-project/filecoin-ffi"

4
storage/sector/fr32/fr32_test.go → extern/sector-storage/fr32/fr32_test.go vendored
View File

@ -12,8 +12,8 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/fr32" "github.com/filecoin-project/lotus/extern/sector-storage/fr32"
) )
func padFFI(buf []byte) []byte { func padFFI(buf []byte) []byte {

0
storage/sector/fr32/readers.go → extern/sector-storage/fr32/readers.go vendored
View File

2
storage/sector/fr32/readers_test.go → extern/sector-storage/fr32/readers_test.go vendored
View File

@ -9,7 +9,7 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/fr32" "github.com/filecoin-project/lotus/extern/sector-storage/fr32"
) )
func TestUnpadReader(t *testing.T) { func TestUnpadReader(t *testing.T) {

0
storage/sector/fr32/utils.go → extern/sector-storage/fr32/utils.go vendored
View File

0
storage/sector/fsutil/dealloc_linux.go → extern/sector-storage/fsutil/dealloc_linux.go vendored
View File

0
storage/sector/fsutil/dealloc_other.go → extern/sector-storage/fsutil/dealloc_other.go vendored
View File

0
storage/sector/fsutil/filesize_unix.go → extern/sector-storage/fsutil/filesize_unix.go vendored
View File

0
storage/sector/fsutil/statfs.go → extern/sector-storage/fsutil/statfs.go vendored
View File

0
storage/sector/fsutil/statfs_unix.go → extern/sector-storage/fsutil/statfs_unix.go vendored
View File

0
storage/sector/fsutil/statfs_windows.go → extern/sector-storage/fsutil/statfs_windows.go vendored
View File

10
storage/sector/localworker.go → extern/sector-storage/localworker.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -15,10 +15,10 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
storage2 "github.com/filecoin-project/specs-storage/storage" storage2 "github.com/filecoin-project/specs-storage/storage"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
var pathTypes = []stores.SectorFileType{stores.FTUnsealed, stores.FTSealed, stores.FTCache} var pathTypes = []stores.SectorFileType{stores.FTUnsealed, stores.FTSealed, stores.FTCache}

12
storage/sector/manager.go → extern/sector-storage/manager.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -6,7 +6,7 @@ import (
"io" "io"
"net/http" "net/http"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
@ -16,10 +16,10 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/specs-storage/storage"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
var log = logging.Logger("advmgr") var log = logging.Logger("advmgr")

10
storage/sector/manager_test.go → extern/sector-storage/manager_test.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"bytes" "bytes"
@ -11,10 +11,10 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"

4
storage/sector/mock/mock.go → extern/sector-storage/mock/mock.go vendored
View File

@ -16,8 +16,8 @@ import (
logging "github.com/ipfs/go-log" logging "github.com/ipfs/go-log"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
var log = logging.Logger("sbmock") var log = logging.Logger("sbmock")

0
storage/sector/mock/mock_test.go → extern/sector-storage/mock/mock_test.go vendored
View File

0
storage/sector/mock/util.go → extern/sector-storage/mock/util.go vendored
View File

2
storage/sector/request_queue.go → extern/sector-storage/request_queue.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import "sort" import "sort"

4
storage/sector/request_queue_test.go → extern/sector-storage/request_queue_test.go vendored
View File

@ -1,10 +1,10 @@
package sector package sectorstorage
import ( import (
"fmt" "fmt"
"testing" "testing"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
) )
func TestRequestQueue(t *testing.T) { func TestRequestQueue(t *testing.T) {

4
storage/sector/resources.go → extern/sector-storage/resources.go vendored
View File

@ -1,9 +1,9 @@
package sector package sectorstorage
import ( import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
) )
type Resources struct { type Resources struct {

4
storage/sector/roprov.go → extern/sector-storage/roprov.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -7,7 +7,7 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
) )
type readonlyProvider struct { type readonlyProvider struct {

6
storage/sector/sched.go → extern/sector-storage/sched.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -12,8 +12,8 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
type schedPrioCtxKey int type schedPrioCtxKey int

4
storage/sector/sched_resources.go → extern/sector-storage/sched_resources.go vendored
View File

@ -1,9 +1,9 @@
package sector package sectorstorage
import ( import (
"sync" "sync"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
func (a *activeResources) withResources(id WorkerID, wr storiface.WorkerResources, r Resources, locker sync.Locker, cb func() error) error { func (a *activeResources) withResources(id WorkerID, wr storiface.WorkerResources, r Resources, locker sync.Locker, cb func() error) error {

10
storage/sector/sched_test.go → extern/sector-storage/sched_test.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -14,10 +14,10 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
"github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/specs-storage/storage"
) )

2
storage/sector/sched_watch.go → extern/sector-storage/sched_watch.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"

0
storage/sector/sealtasks/task.go → extern/sector-storage/sealtasks/task.go vendored
View File

6
storage/sector/selector_alloc.go → extern/sector-storage/selector_alloc.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -7,8 +7,8 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
) )
type allocSelector struct { type allocSelector struct {

6
storage/sector/selector_existing.go → extern/sector-storage/selector_existing.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -7,8 +7,8 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
) )
type existingSelector struct { type existingSelector struct {

6
storage/sector/selector_task.go → extern/sector-storage/selector_task.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -7,8 +7,8 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
) )
type taskSelector struct { type taskSelector struct {

4
storage/sector/stats.go → extern/sector-storage/stats.go vendored
View File

@ -1,6 +1,6 @@
package sector package sectorstorage
import "github.com/filecoin-project/lotus/storage/sector/storiface" import "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
func (m *Manager) WorkerStats() map[uint64]storiface.WorkerStats { func (m *Manager) WorkerStats() map[uint64]storiface.WorkerStats {
m.sched.workersLk.RLock() m.sched.workersLk.RLock()

0
storage/sector/stores/filetype.go → extern/sector-storage/stores/filetype.go vendored
View File

2
storage/sector/stores/http_handler.go → extern/sector-storage/stores/http_handler.go vendored
View File

@ -10,7 +10,7 @@ import (
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/lotus/storage/sector/tarutil" "github.com/filecoin-project/lotus/extern/sector-storage/tarutil"
) )
var log = logging.Logger("stores") var log = logging.Logger("stores")

2
storage/sector/stores/index.go → extern/sector-storage/stores/index.go vendored
View File

@ -10,7 +10,7 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/abi/big" "github.com/filecoin-project/specs-actors/actors/abi/big"

0
storage/sector/stores/index_locks.go → extern/sector-storage/stores/index_locks.go vendored
View File

0
storage/sector/stores/index_locks_test.go → extern/sector-storage/stores/index_locks_test.go vendored
View File

0
storage/sector/stores/index_locks_util.go → extern/sector-storage/stores/index_locks_util.go vendored
View File

2
storage/sector/stores/interface.go → extern/sector-storage/stores/interface.go vendored
View File

@ -3,7 +3,7 @@ package stores
import ( import (
"context" "context"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
) )

2
storage/sector/stores/local.go → extern/sector-storage/stores/local.go vendored
View File

@ -15,7 +15,7 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
) )
type StoragePath struct { type StoragePath struct {

2
storage/sector/stores/local_test.go → extern/sector-storage/stores/local_test.go vendored
View File

@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

6
storage/sector/stores/remote.go → extern/sector-storage/stores/remote.go vendored
View File

@ -14,9 +14,9 @@ import (
"sort" "sort"
"sync" "sync"
"github.com/filecoin-project/lotus/storage/sector/fsutil" "github.com/filecoin-project/lotus/extern/sector-storage/fsutil"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
"github.com/filecoin-project/lotus/storage/sector/tarutil" "github.com/filecoin-project/lotus/extern/sector-storage/tarutil"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"

0
storage/sector/stores/util_unix.go → extern/sector-storage/stores/util_unix.go vendored
View File

0
storage/sector/storiface/ffi.go → extern/sector-storage/storiface/ffi.go vendored
View File

2
storage/sector/storiface/worker.go → extern/sector-storage/storiface/worker.go vendored
View File

@ -3,7 +3,7 @@ package storiface
import ( import (
"time" "time"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
) )

0
storage/sector/tarutil/systar.go → extern/sector-storage/tarutil/systar.go vendored
View File

10
storage/sector/testworker_test.go → extern/sector-storage/testworker_test.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -9,10 +9,10 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/specs-storage/storage"
"github.com/filecoin-project/lotus/storage/sector/mock" "github.com/filecoin-project/lotus/extern/sector-storage/mock"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
type testWorker struct { type testWorker struct {

8
storage/sector/work_tracker.go → extern/sector-storage/work_tracker.go vendored
View File

@ -1,4 +1,4 @@
package sector package sectorstorage
import ( import (
"context" "context"
@ -11,9 +11,9 @@ import (
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-storage/storage" "github.com/filecoin-project/specs-storage/storage"
"github.com/filecoin-project/lotus/storage/sector/sealtasks" "github.com/filecoin-project/lotus/extern/sector-storage/sealtasks"
"github.com/filecoin-project/lotus/storage/sector/stores" "github.com/filecoin-project/lotus/extern/sector-storage/stores"
"github.com/filecoin-project/lotus/storage/sector/storiface" "github.com/filecoin-project/lotus/extern/sector-storage/storiface"
) )
type workTracker struct { type workTracker struct {

0
storage/sector/zerocomm/zerocomm.go → extern/sector-storage/zerocomm/zerocomm.go vendored
View File

4
storage/sector/zerocomm/zerocomm_test.go → extern/sector-storage/zerocomm/zerocomm_test.go vendored
View File

@ -10,8 +10,8 @@ import (
abi "github.com/filecoin-project/specs-actors/actors/abi" abi "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/zerocomm" "github.com/filecoin-project/lotus/extern/sector-storage/zerocomm"
) )
func TestComms(t *testing.T) { func TestComms(t *testing.T) {

0
storage/sealing/cbor_gen.go → extern/storage-sealing/cbor_gen.go vendored
View File

4
storage/sealing/checks.go → extern/storage-sealing/checks.go vendored
View File

@ -7,8 +7,8 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/lotus/storage/sector/zerocomm" "github.com/filecoin-project/lotus/extern/sector-storage/zerocomm"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/builtin/miner" "github.com/filecoin-project/specs-actors/actors/builtin/miner"
"github.com/filecoin-project/specs-actors/actors/crypto" "github.com/filecoin-project/specs-actors/actors/crypto"

0
storage/sealing/constants.go → extern/storage-sealing/constants.go vendored
View File

0
storage/sealing/events.go → extern/storage-sealing/events.go vendored
View File

0
storage/sealing/fsm.go → extern/storage-sealing/fsm.go vendored
View File

0
storage/sealing/fsm_events.go → extern/storage-sealing/fsm_events.go vendored
View File

0
storage/sealing/fsm_test.go → extern/storage-sealing/fsm_test.go vendored
View File

0
storage/sealing/garbage.go → extern/storage-sealing/garbage.go vendored
View File

2
storage/sealing/gen/main.go → extern/storage-sealing/gen/main.go vendored
View File

@ -6,7 +6,7 @@ import (
gen "github.com/whyrusleeping/cbor-gen" gen "github.com/whyrusleeping/cbor-gen"
"github.com/filecoin-project/lotus/storage/sealing" "github.com/filecoin-project/lotus/extern/storage-sealing"
) )
func main() { func main() {

0
storage/sealing/lib/nullreader/nullreader.go → extern/storage-sealing/lib/nullreader/nullreader.go vendored
View File

0
storage/sealing/nullreader.go → extern/storage-sealing/nullreader.go vendored
View File

0
storage/sealing/precommit_policy.go → extern/storage-sealing/precommit_policy.go vendored
View File

2
storage/sealing/precommit_policy_test.go → extern/storage-sealing/precommit_policy_test.go vendored
View File

@ -11,7 +11,7 @@ import (
commcid "github.com/filecoin-project/go-fil-commcid" commcid "github.com/filecoin-project/go-fil-commcid"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/lotus/storage/sealing" "github.com/filecoin-project/lotus/extern/storage-sealing"
) )
type fakeChain struct { type fakeChain struct {

10
storage/sealing/sealing.go → extern/storage-sealing/sealing.go vendored
View File

@ -15,8 +15,8 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
padreader "github.com/filecoin-project/go-padreader" padreader "github.com/filecoin-project/go-padreader"
statemachine "github.com/filecoin-project/go-statemachine" statemachine "github.com/filecoin-project/go-statemachine"
"github.com/filecoin-project/lotus/storage/sector" "github.com/filecoin-project/lotus/extern/sector-storage"
"github.com/filecoin-project/lotus/storage/sector/ffiwrapper" "github.com/filecoin-project/lotus/extern/sector-storage/ffiwrapper"
"github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/abi/big" "github.com/filecoin-project/specs-actors/actors/abi/big"
"github.com/filecoin-project/specs-actors/actors/builtin/market" "github.com/filecoin-project/specs-actors/actors/builtin/market"
@ -59,7 +59,7 @@ type Sealing struct {
maddr address.Address maddr address.Address
sealer sector.SectorManager sealer sectorstorage.SectorManager
sectors *statemachine.StateGroup sectors *statemachine.StateGroup
sc SectorIDCounter sc SectorIDCounter
verif ffiwrapper.Verifier verif ffiwrapper.Verifier
@ -90,7 +90,7 @@ type UnsealedSectorInfo struct {
pieceSizes []abi.UnpaddedPieceSize pieceSizes []abi.UnpaddedPieceSize
} }
func New(api SealingAPI, fc FeeConfig, events Events, maddr address.Address, ds datastore.Batching, sealer sector.SectorManager, sc SectorIDCounter, verif ffiwrapper.Verifier, pcp PreCommitPolicy, gsd GetSealingDelayFunc) *Sealing { func New(api SealingAPI, fc FeeConfig, events Events, maddr address.Address, ds datastore.Batching, sealer sectorstorage.SectorManager, sc SectorIDCounter, verif ffiwrapper.Verifier, pcp PreCommitPolicy, gsd GetSealingDelayFunc) *Sealing {
s := &Sealing{ s := &Sealing{
api: api, api: api,
feeCfg: fc, feeCfg: fc,
@ -174,7 +174,7 @@ func (m *Sealing) AddPieceToAnySector(ctx context.Context, size abi.UnpaddedPiec
// Caller should hold m.unsealedInfoMap.mux // Caller should hold m.unsealedInfoMap.mux
func (m *Sealing) addPiece(ctx context.Context, sectorID abi.SectorNumber, size abi.UnpaddedPieceSize, r io.Reader, di *DealInfo) error { func (m *Sealing) addPiece(ctx context.Context, sectorID abi.SectorNumber, size abi.UnpaddedPieceSize, r io.Reader, di *DealInfo) error {
log.Infof("Adding piece to sector %d", sectorID) log.Infof("Adding piece to sector %d", sectorID)
ppi, err := m.sealer.AddPiece(sector.WithPriority(ctx, DealSectorPriority), m.minerSector(sectorID), m.unsealedInfoMap.infos[sectorID].pieceSizes, size, r) ppi, err := m.sealer.AddPiece(sectorstorage.WithPriority(ctx, DealSectorPriority), m.minerSector(sectorID), m.unsealedInfoMap.infos[sectorID].pieceSizes, size, r)
if err != nil { if err != nil {
return xerrors.Errorf("writing piece: %w", err) return xerrors.Errorf("writing piece: %w", err)
} }

0
storage/sealing/sector_state.go → extern/storage-sealing/sector_state.go vendored
View File

0
storage/sealing/states_failed.go → extern/storage-sealing/states_failed.go vendored
View File

Some files were not shown because too many files have changed in this diff Show More