From 5e16aab51b4c6a51a3ca735b7e7b580c24a14775 Mon Sep 17 00:00:00 2001 From: whyrusleeping Date: Thu, 9 Jan 2020 10:28:14 -0800 Subject: [PATCH] fix tests, expand interfaces a little --- node/impl/storminer.go | 5 +++-- node/node_test.go | 2 +- storage/miner.go | 6 ++++++ storage/sbmock/sbmock.go | 17 +++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/node/impl/storminer.go b/node/impl/storminer.go index 5568ed529..ac149b64b 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -3,12 +3,13 @@ package impl import ( "context" "encoding/json" - "github.com/filecoin-project/lotus/api/apistruct" "io" "mime" "net/http" "os" + "github.com/filecoin-project/lotus/api/apistruct" + "github.com/gorilla/mux" files "github.com/ipfs/go-ipfs-files" @@ -25,7 +26,7 @@ type StorageMinerAPI struct { CommonAPI SectorBuilderConfig *sectorbuilder.Config - SectorBuilder *sectorbuilder.SectorBuilder + SectorBuilder storage.SectorBuilder SectorBlocks *sectorblocks.SectorBlocks Miner *storage.Miner diff --git a/node/node_test.go b/node/node_test.go index 3903e2dae..b229a2fef 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -236,7 +236,7 @@ func builder(t *testing.T, nFull int, storage []int) ([]test.TestNode, []test.Te t.Fatal(err) } - if err := sma.SectorBuilder.ImportFrom(osb, false); err != nil { + if err := sma.SectorBuilder.(*sectorbuilder.SectorBuilder).ImportFrom(osb, false); err != nil { t.Fatal(err) } diff --git a/storage/miner.go b/storage/miner.go index 4a35e1dd4..ed2b8876f 100644 --- a/storage/miner.go +++ b/storage/miner.go @@ -81,6 +81,12 @@ type SectorBuilder interface { GenerateFallbackPoSt(sectorbuilder.SortedPublicSectorInfo, [sectorbuilder.CommLen]byte, []uint64) ([]sectorbuilder.EPostCandidate, []byte, error) SealPreCommit(uint64, sectorbuilder.SealTicket, []sectorbuilder.PublicPieceInfo) (sectorbuilder.RawSealPreCommitOutput, error) SealCommit(uint64, sectorbuilder.SealTicket, sectorbuilder.SealSeed, []sectorbuilder.PublicPieceInfo, sectorbuilder.RawSealPreCommitOutput) ([]byte, error) + + // Not so sure about these being on the interface + GetPath(string, string) (string, error) + WorkerStats() sectorbuilder.WorkerStats + AddWorker(context.Context, sectorbuilder.WorkerCfg) (<-chan sectorbuilder.WorkerTask, error) + TaskDone(context.Context, uint64, sectorbuilder.SealRes) error } func NewMiner(api storageMinerApi, addr address.Address, h host.Host, ds datastore.Batching, sb SectorBuilder, tktFn TicketFn) (*Miner, error) { diff --git a/storage/sbmock/sbmock.go b/storage/sbmock/sbmock.go index a46ec5bfa..dd886fe30 100644 --- a/storage/sbmock/sbmock.go +++ b/storage/sbmock/sbmock.go @@ -1,6 +1,7 @@ package sbmock import ( + "context" "io" "io/ioutil" "math/rand" @@ -119,3 +120,19 @@ func (sb *SBMock) SealCommit(sid uint64, ticket sectorbuilder.SealTicket, seed s rand.Read(buf) return buf, nil } + +func (sb *SBMock) GetPath(string, string) (string, error) { + panic("nyi") +} + +func (sb *SBMock) WorkerStats() sectorbuilder.WorkerStats { + panic("nyi") +} + +func (sb *SBMock) AddWorker(context.Context, sectorbuilder.WorkerCfg) (<-chan sectorbuilder.WorkerTask, error) { + panic("nyi") +} + +func (sb *SBMock) TaskDone(context.Context, uint64, sectorbuilder.SealRes) error { + panic("nyi") +}