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

Merge pull request #5216 from filecoin-project/fix/fix-dealexp-panic

Browse Source 
markets: Fix deal expired panic
This commit is contained in:
Łukasz Magiera 2020-12-17 16:44:32 +01:00 committed by GitHub
commit 19d457ae5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
markets/storageadapter/client.go
View File

@ -264,7 +264,7 @@ func (c *ClientNodeAdapter) OnDealExpiredOrSlashed(ctx context.Context, dealID a
// and the chain has advanced to the confidence height // and the chain has advanced to the confidence height
stateChanged := func(ts *types.TipSet, ts2 *types.TipSet, states events.StateChange, h abi.ChainEpoch) (more bool, err error) { stateChanged := func(ts *types.TipSet, ts2 *types.TipSet, states events.StateChange, h abi.ChainEpoch) (more bool, err error) {
// Check if the deal has already expired // Check if the deal has already expired
if sd.Proposal.EndEpoch <= ts2.Height() { if ts2 == nil || sd.Proposal.EndEpoch <= ts2.Height() {
onDealExpired(nil) onDealExpired(nil)
return false, nil return false, nil
} }

2
markets/storageadapter/provider.go
View File

@ -344,7 +344,7 @@ func (n *ProviderNodeAdapter) OnDealExpiredOrSlashed(ctx context.Context, dealID
// and the chain has advanced to the confidence height // and the chain has advanced to the confidence height
stateChanged := func(ts *types.TipSet, ts2 *types.TipSet, states events.StateChange, h abi.ChainEpoch) (more bool, err error) { stateChanged := func(ts *types.TipSet, ts2 *types.TipSet, states events.StateChange, h abi.ChainEpoch) (more bool, err error) {
// Check if the deal has already expired // Check if the deal has already expired
if sd.Proposal.EndEpoch <= ts2.Height() { if ts2 == nil || sd.Proposal.EndEpoch <= ts2.Height() {
onDealExpired(nil) onDealExpired(nil)
return false, nil return false, nil
} }