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

revert MockSectorMgr

Browse Source
This commit is contained in:
Anton Evangelatov 2021-06-22 15:22:08 +02:00
parent 9567807144
commit a828b15fbe
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
itests/kit/ensemble.go
View File

@ -30,6 +30,7 @@ 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/cmd/lotus-seed/seed" "github.com/filecoin-project/lotus/cmd/lotus-seed/seed"
sectorstorage "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/ffiwrapper"
"github.com/filecoin-project/lotus/extern/sector-storage/mock" "github.com/filecoin-project/lotus/extern/sector-storage/mock"
"github.com/filecoin-project/lotus/genesis" "github.com/filecoin-project/lotus/genesis"
@ -502,36 +503,43 @@ func (n *Ensemble) Start() *Ensemble {
// disable resource filtering so that local worker gets assigned tasks // disable resource filtering so that local worker gets assigned tasks
// regardless of system pressure. // regardless of system pressure.
// TODO: (anteva) this is missing??? node.Override(new(sectorstorage.SealerConfig), func() sectorstorage.SealerConfig {
//node.Override(new(sectorstorage.SealerConfig), func() sectorstorage.SealerConfig { scfg := config.DefaultStorageMiner()
//scfg := config.DefaultStorageMiner() scfg.Storage.ResourceFiltering = sectorstorage.ResourceFilteringDisabled
//scfg.Storage.ResourceFiltering = sectorstorage.ResourceFilteringDisabled return scfg.Storage
//return scfg.Storage }),
//}),
} }
// append any node builder options. // append any node builder options.
opts = append(opts, m.options.extraNodeOpts...) opts = append(opts, m.options.extraNodeOpts...)
_, err = address.IDFromAddress(m.ActorAddr) idAddr, err := address.IDFromAddress(m.ActorAddr)
require.NoError(n.t, err) require.NoError(n.t, err)
// preload preseals if the network still hasn't bootstrapped. // preload preseals if the network still hasn't bootstrapped.
//var presealSectors []abi.SectorID var presealSectors []abi.SectorID
//if !n.bootstrapped { if !n.bootstrapped {
//sectors := n.genesis.miners[i].Sectors sectors := n.genesis.miners[i].Sectors
//for _, sector := range sectors { for _, sector := range sectors {
//presealSectors = append(presealSectors, abi.SectorID{ presealSectors = append(presealSectors, abi.SectorID{
//Miner: abi.ActorID(idAddr), Miner: abi.ActorID(idAddr),
//Number: sector.SectorID, Number: sector.SectorID,
//}) })
//} }
//} }
if n.options.mockProofs { if n.options.mockProofs {
opts = append(opts, opts = append(opts,
node.Override(new(*mock.SectorMgr), func() (*mock.SectorMgr, error) {
return mock.NewMockSectorMgr(presealSectors), nil
}),
node.Override(new(sectorstorage.SectorManager), node.From(new(*mock.SectorMgr))),
node.Override(new(sectorstorage.Unsealer), node.From(new(*mock.SectorMgr))),
node.Override(new(sectorstorage.PieceProvider), node.From(new(*mock.SectorMgr))),
node.Override(new(ffiwrapper.Verifier), mock.MockVerifier), node.Override(new(ffiwrapper.Verifier), mock.MockVerifier),
node.Override(new(ffiwrapper.Prover), mock.MockProver), node.Override(new(ffiwrapper.Prover), mock.MockProver),
node.Unset(new(*sectorstorage.Manager)),
) )
} }