fix lotus-shed build

This commit is contained in:
vyzo 2020-12-01 17:47:14 +02:00
parent 622b4f7d9d
commit 3912694fb7
2 changed files with 38 additions and 3 deletions

View File

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

View File

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