748d2e82a7
Motivation: * Run lotus with the race detector enabled (primary motivation). * Allow multiple lotus nodes in a process (not a high priority). Previously, the journal was shared between all lotus instances, but it was initialized for every new node. This caused safety problems in tests (at a minimum). This patch explicitly passes the journal to all services that need it.
56 lines
1.4 KiB
Go
56 lines
1.4 KiB
Go
package miner
|
|
|
|
import (
|
|
"context"
|
|
|
|
lru "github.com/hashicorp/golang-lru"
|
|
ds "github.com/ipfs/go-datastore"
|
|
|
|
"github.com/filecoin-project/go-address"
|
|
"github.com/filecoin-project/go-state-types/abi"
|
|
"github.com/filecoin-project/lotus/api"
|
|
"github.com/filecoin-project/lotus/chain/gen"
|
|
"github.com/filecoin-project/lotus/chain/gen/slashfilter"
|
|
"github.com/filecoin-project/lotus/journal"
|
|
)
|
|
|
|
type MineReq struct {
|
|
InjectNulls abi.ChainEpoch
|
|
Done func(bool, abi.ChainEpoch, error)
|
|
}
|
|
|
|
func NewTestMiner(nextCh <-chan MineReq, addr address.Address) func(api.FullNode, gen.WinningPoStProver) *Miner {
|
|
return func(api api.FullNode, epp gen.WinningPoStProver) *Miner {
|
|
arc, err := lru.NewARC(10000)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
m := &Miner{
|
|
api: api,
|
|
waitFunc: chanWaiter(nextCh),
|
|
epp: epp,
|
|
minedBlockHeights: arc,
|
|
address: addr,
|
|
sf: slashfilter.New(ds.NewMapDatastore()),
|
|
journal: journal.NilJournal(),
|
|
}
|
|
|
|
if err := m.Start(context.TODO()); err != nil {
|
|
panic(err)
|
|
}
|
|
return m
|
|
}
|
|
}
|
|
|
|
func chanWaiter(next <-chan MineReq) func(ctx context.Context, _ uint64) (func(bool, abi.ChainEpoch, error), abi.ChainEpoch, error) {
|
|
return func(ctx context.Context, _ uint64) (func(bool, abi.ChainEpoch, error), abi.ChainEpoch, error) {
|
|
select {
|
|
case <-ctx.Done():
|
|
return nil, 0, ctx.Err()
|
|
case req := <-next:
|
|
return req.Done, req.InjectNulls, nil
|
|
}
|
|
}
|
|
}
|