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

Fix tests after specs-storage changes

Browse Source
This commit is contained in:
Łukasz Magiera
2020-03-18 02:08:11 +01:00
parent d8ce5078d9
commit 5f2caffb51
19 changed files with 90 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
storage/miner.go
+8 -5
View File
@@ -3,6 +3,7 @@ package storage
import (
"context"
"errors"
"github.com/filecoin-project/lotus/node/modules/dtypes"
"time"
"github.com/filecoin-project/go-address"
@@ -36,6 +37,7 @@ type Miner struct {
sealer sealmgr.Manager
ds datastore.Batching
tktFn sealing.TicketFn
sc sealing.SectorIDCounter
maddr address.Address
worker address.Address
@@ -72,13 +74,14 @@ type storageMinerApi interface {
WalletHas(context.Context, address.Address) (bool, error)
}
func NewMiner(api storageMinerApi, maddr, worker address.Address, h host.Host, ds datastore.Batching, sealer sealmgr.Manager, tktFn sealing.TicketFn) (*Miner, error) {
func NewMiner(api storageMinerApi, maddr, worker address.Address, h host.Host, ds datastore.Batching, sealer sealmgr.Manager, sc sealing.SectorIDCounter, tktFn sealing.TicketFn) (*Miner, error) {
m := &Miner{
api: api,
h: h,
sealer: sealer,
ds: ds,
tktFn: tktFn,
sc: sc,
maddr: maddr,
worker: worker,
@@ -93,7 +96,7 @@ func (m *Miner) Run(ctx context.Context) error {
}
evts := events.NewEvents(ctx, m.api)
m.sealing = sealing.New(m.api, evts, m.maddr, m.worker, m.ds, m.sealer, m.tktFn)
m.sealing = sealing.New(m.api, evts, m.maddr, m.worker, m.ds, m.sealer, m.sc, m.tktFn)
go m.sealing.Run(ctx)
@@ -121,11 +124,11 @@ func (m *Miner) runPreflightChecks(ctx context.Context) error {
type SectorBuilderEpp struct {
prover storage.Prover
miner abi.ActorID
miner abi.ActorID
}
func NewElectionPoStProver(sb storage.Prover, miner abi.ActorID) *SectorBuilderEpp {
return &SectorBuilderEpp{sb, miner}
func NewElectionPoStProver(sb storage.Prover, miner dtypes.MinerID) *SectorBuilderEpp {
return &SectorBuilderEpp{sb, abi.ActorID(miner)}
}
var _ gen.ElectionPoStProver = (*SectorBuilderEpp)(nil)
storage/sbmock/sbmock.go
+9 -7
View File
@@ -304,25 +304,27 @@ func (sb *SBMock) ReadPieceFromSealedSector(ctx context.Context, sectorID abi.Se
return ioutil.NopCloser(io.LimitReader(bytes.NewReader(sb.sectors[sectorID].pieces[0].Bytes()[offset:]), int64(size))), nil
}
func (sb *SBMock) StageFakeData(mid abi.ActorID) (abi.SectorNumber, []abi.PieceInfo, error) {
func (sb *SBMock) StageFakeData(mid abi.ActorID) (abi.SectorID, []abi.PieceInfo, error) {
usize := abi.PaddedPieceSize(sb.sectorSize).Unpadded()
sid, err := sb.AcquireSectorNumber()
if err != nil {
return 0, nil, err
return abi.SectorID{}, nil, err
}
buf := make([]byte, usize)
rand.Read(buf)
pi, err := sb.AddPiece(context.TODO(), abi.SectorID{
id := abi.SectorID{
Miner: mid,
Number: sid,
}, nil, usize, bytes.NewReader(buf))
if err != nil {
return 0, nil, err
}
return sid, []abi.PieceInfo{pi}, nil
pi, err := sb.AddPiece(context.TODO(), id, nil, usize, bytes.NewReader(buf))
if err != nil {
return abi.SectorID{}, nil, err
}
return id, []abi.PieceInfo{pi}, nil
}
func (sb *SBMock) FinalizeSector(context.Context, abi.SectorID) error {
storage/sbmock/sbmock_test.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
func TestOpFinish(t *testing.T) {
sb := NewMockSectorBuilder(1, 2048)
sid, pieces, err := sb.StageFakeData()
sid, pieces, err := sb.StageFakeData(123)
if err != nil {
t.Fatal(err)
}
storage/sealing/sealing.go
+3 -2
View File
@@ -75,7 +75,7 @@ type Sealing struct {
sc SectorIDCounter
}
func New(api sealingApi, events *events.Events, maddr address.Address, worker address.Address, ds datastore.Batching, sealer sealmgr.Manager, tktFn TicketFn) *Sealing {
func New(api sealingApi, events *events.Events, maddr address.Address, worker address.Address, ds datastore.Batching, sealer sealmgr.Manager, sc SectorIDCounter, tktFn TicketFn) *Sealing {
s := &Sealing{
api: api,
events: events,
@@ -84,6 +84,7 @@ func New(api sealingApi, events *events.Events, maddr address.Address, worker ad
worker: worker,
sealer: sealer,
tktFn: tktFn,
sc: sc,
}
s.sectors = statemachine.New(namespace.Wrap(ds, datastore.NewKey(SectorStorePrefix)), s, SectorInfo{})
@@ -163,7 +164,7 @@ func (m *Sealing) minerSector(num abi.SectorNumber) abi.SectorID {
return abi.SectorID{
Number: num,
Miner: abi.ActorID(mid),
Miner: abi.ActorID(mid),
}
}
storage/sealmgr/advmgr/local.go
-1
View File
@@ -70,7 +70,6 @@ func (l *LocalWorker) sb() (sectorbuilder.Basic, error) {
return sectorbuilder.New(&localWorkerPathProvider{w: l}, l.scfg)
}
func (l *LocalWorker) NewSector(ctx context.Context, sector abi.SectorID) error {
sb, err := l.sb()
if err != nil {
storage/sealmgr/advmgr/manager.go
+2 -2
View File
@@ -42,7 +42,7 @@ type Manager struct {
storage2.Prover
}
func New(ls stores.LocalStorage, si *stores.Index, cfg *sectorbuilder.Config, urls URLs) (*Manager, error) {
func New(ls stores.LocalStorage, si *stores.Index, cfg *sectorbuilder.Config, urls URLs, sindex stores.SectorIndex) (*Manager, error) {
stor, err := stores.NewLocal(ls)
if err != nil {
return nil, err
@@ -59,7 +59,7 @@ func New(ls stores.LocalStorage, si *stores.Index, cfg *sectorbuilder.Config, ur
m := &Manager{
workers: []Worker{
&LocalWorker{scfg: cfg, storage: stor},
&LocalWorker{scfg: cfg, localStore: stor, storage: stor, sindex: sindex},
},
scfg: cfg,
storage/sealmgr/advmgr/roprov.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
)
type readonlyProvider struct {
stor *stores.Local
stor *stores.Local
}
func (l *readonlyProvider) AcquireSector(ctx context.Context, id abi.SectorID, existing sectorbuilder.SectorFileType, allocate sectorbuilder.SectorFileType, sealing bool) (sectorbuilder.SectorPaths, func(), error) {
storage/sealmgr/simple.go
+4
View File
@@ -31,6 +31,10 @@ type sszgetter interface {
SectorSize() abi.SectorSize
}
func (s *LocalWorker) SectorSize() abi.SectorSize {
return s.Basic.(sszgetter).SectorSize()
}
func (s *Simple) SectorSize() abi.SectorSize {
return s.worker.(sszgetter).SectorSize()
}