diff --git a/cmd/lotus-storage-miner/proving.go b/cmd/lotus-storage-miner/proving.go index f053af054..b930476e6 100644 --- a/cmd/lotus-storage-miner/proving.go +++ b/cmd/lotus-storage-miner/proving.go @@ -443,6 +443,9 @@ var provingCheckProvableCmd = &cli.Command{ sectors := make(map[abi.SectorNumber]struct{}) sectorInfos, err := api.StateMinerSectors(ctx, addr, &par.AllSectors, types.EmptyTSK) + if err != nil { + return err + } var tocheck []storage.SectorRef for _, info := range sectorInfos { diff --git a/extern/sector-storage/mock/mock.go b/extern/sector-storage/mock/mock.go index 6179f40d7..59d7d0503 100644 --- a/extern/sector-storage/mock/mock.go +++ b/extern/sector-storage/mock/mock.go @@ -405,14 +405,14 @@ func (mgr *SectorMgr) Remove(ctx context.Context, sector storage.SectorRef) erro return nil } -func (mgr *SectorMgr) CheckProvable(ctx context.Context, pp abi.RegisteredPoStProof, ids []storage.SectorRef) ([]abi.SectorID, error) { - var bad []abi.SectorID +func (mgr *SectorMgr) CheckProvable(ctx context.Context, pp abi.RegisteredPoStProof, ids []storage.SectorRef) (map[abi.SectorID]string, error) { + bad := map[abi.SectorID]string{} for _, sid := range ids { _, found := mgr.sectors[sid.ID] if !found || mgr.sectors[sid.ID].failed { - bad = append(bad, sid.ID) + bad[sid.ID] = "mock fail" } } diff --git a/storage/wdpost_run_test.go b/storage/wdpost_run_test.go index d426f5f31..5b85261c2 100644 --- a/storage/wdpost_run_test.go +++ b/storage/wdpost_run_test.go @@ -125,9 +125,9 @@ func (m *mockProver) GenerateWindowPoSt(ctx context.Context, aid abi.ActorID, si type mockFaultTracker struct { } -func (m mockFaultTracker) CheckProvable(ctx context.Context, pp abi.RegisteredPoStProof, sectors []storage.SectorRef) ([]abi.SectorID, error) { +func (m mockFaultTracker) CheckProvable(ctx context.Context, pp abi.RegisteredPoStProof, sectors []storage.SectorRef) (map[abi.SectorID]string, error) { // Returns "bad" sectors so just return nil meaning all sectors are good - return nil, nil + return map[abi.SectorID]string{}, nil } // TestWDPostDoPost verifies that doPost will send the correct number of window