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

return an error when we fail to find a sector when checking sector expiration

Browse Source 
Returning nil, nil is a footgun.

fix: https://github.com/filecoin-project/lotus/issues/3984
This commit is contained in:
Steven Allen 2020-09-25 11:27:30 -07:00
parent e5873d5dea
commit bdc782617f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chain/actors/builtin/miner/v0.go
View File

@ -6,6 +6,7 @@ import (
"github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/peer"
cbg "github.com/whyrusleeping/cbor-gen" cbg "github.com/whyrusleeping/cbor-gen"
"golang.org/x/xerrors"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-bitfield" "github.com/filecoin-project/go-bitfield"
@ -96,9 +97,7 @@ func (s *state0) NumLiveSectors() (uint64, error) {
// GetSectorExpiration returns the effective expiration of the given sector. // GetSectorExpiration returns the effective expiration of the given sector.
// //
// If the sector isn't found or has already been terminated, this method returns // If the sector does not expire early, the Early expiration field is 0.
// nil and no error. If the sector does not expire early, the Early expiration
// field is 0.
func (s *state0) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, error) { func (s *state0) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, error) {
dls, err := s.State.LoadDeadlines(s.store) dls, err := s.State.LoadDeadlines(s.store)
if err != nil { if err != nil {
@ -161,7 +160,7 @@ func (s *state0) GetSectorExpiration(num abi.SectorNumber) (*SectorExpiration, e
return nil, err return nil, err
} }
if out.Early == 0 && out.OnTime == 0 { if out.Early == 0 && out.OnTime == 0 {
return nil, nil return nil, xerrors.Errorf("failed to find sector %d", num)
} }
return &out, nil return &out, nil
} }