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

remove references to splitstore from lotus-shed

Browse Source
This commit is contained in:
vyzo 2021-02-28 13:41:07 +02:00
parent 05fee27840
commit e582f0b713
2 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/lotus-shed/balances.go
View File

@ -36,7 +36,6 @@ import (
"github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/state"
"github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/stmgr"
"github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/store"
"github.com/filecoin-project/lotus/chain/store/splitstore"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"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"
@ -194,18 +193,7 @@ var chainBalanceStateCmd = &cli.Command{
return err return err
} }
ssPath, err := lkrepo.SplitstorePath() cs := store.NewChainStore(bs, bs, mds, vm.Syscalls(ffiwrapper.ProofVerifier), nil)
if err != nil {
return err
}
ss, err := splitstore.NewSplitStore(ssPath, mds, bs)
if err != nil {
return err
}
defer ss.Close() //nolint:errcheck
cs := store.NewChainStore(ss, ss, mds, vm.Syscalls(ffiwrapper.ProofVerifier), nil)
defer cs.Close() //nolint:errcheck defer cs.Close() //nolint:errcheck
cst := cbor.NewCborStore(bs) cst := cbor.NewCborStore(bs)
@ -426,18 +414,7 @@ var chainPledgeCmd = &cli.Command{
return err return err
} }
ssPath, err := lkrepo.SplitstorePath() cs := store.NewChainStore(bs, bs, mds, vm.Syscalls(ffiwrapper.ProofVerifier), nil)
if err != nil {
return err
}
ss, err := splitstore.NewSplitStore(ssPath, mds, bs)
if err != nil {
return err
}
defer ss.Close() //nolint:errcheck
cs := store.NewChainStore(ss, ss, mds, vm.Syscalls(ffiwrapper.ProofVerifier), nil)
defer cs.Close() //nolint:errcheck defer cs.Close() //nolint:errcheck
cst := cbor.NewCborStore(bs) cst := cbor.NewCborStore(bs)

14
cmd/lotus-shed/export.go
View File

@ -12,7 +12,6 @@ import (
"github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/lotus/chain/store" "github.com/filecoin-project/lotus/chain/store"
"github.com/filecoin-project/lotus/chain/store/splitstore"
"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/node/repo" "github.com/filecoin-project/lotus/node/repo"
@ -91,18 +90,7 @@ var exportChainCmd = &cli.Command{
return err return err
} }
ssPath, err := lr.SplitstorePath() cs := store.NewChainStore(bs, bs, mds, nil, nil)
if err != nil {
return err
}
ss, err := splitstore.NewSplitStore(ssPath, mds, bs)
if err != nil {
return err
}
defer ss.Close() //nolint:errcheck
cs := store.NewChainStore(ss, ss, mds, nil, nil)
defer cs.Close() //nolint:errcheck defer cs.Close() //nolint:errcheck
if err := cs.Load(); err != nil { if err := cs.Load(); err != nil {