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

Merge pull request #4403 from filecoin-project/frrist/fix-miner-shim-impls

Browse Source 
fix: return true when deadlines changed
This commit is contained in:
Łukasz Magiera 2020-10-15 00:13:36 +02:00 committed by GitHub
commit d02d4bc275
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
chain/actors/builtin/miner/diff_deadlines.go
View File

@ -7,9 +7,9 @@ import (
"github.com/filecoin-project/go-state-types/exitcode" "github.com/filecoin-project/go-state-types/exitcode"
) )
type DeadlinesDiff map[uint64]*DeadlineDiff type DeadlinesDiff map[uint64]DeadlineDiff
func DiffDeadlines(pre, cur State) (*DeadlinesDiff, error) { func DiffDeadlines(pre, cur State) (DeadlinesDiff, error) {
changed, err := pre.DeadlinesChanged(cur) changed, err := pre.DeadlinesChanged(cur)
if err != nil { if err != nil {
return nil, err return nil, err
@ -18,11 +18,7 @@ func DiffDeadlines(pre, cur State) (*DeadlinesDiff, error) {
return nil, nil return nil, nil
} }
numDl, err := pre.NumDeadlines() dlDiff := make(DeadlinesDiff)
if err != nil {
return nil, err
}
dlDiff := make(DeadlinesDiff, numDl)
if err := pre.ForEachDeadline(func(idx uint64, preDl Deadline) error { if err := pre.ForEachDeadline(func(idx uint64, preDl Deadline) error {
curDl, err := cur.LoadDeadline(idx) curDl, err := cur.LoadDeadline(idx)
if err != nil { if err != nil {
@ -39,12 +35,12 @@ func DiffDeadlines(pre, cur State) (*DeadlinesDiff, error) {
}); err != nil { }); err != nil {
return nil, err return nil, err
} }
return &dlDiff, nil return dlDiff, nil
} }
type DeadlineDiff map[uint64]*PartitionDiff type DeadlineDiff map[uint64]*PartitionDiff
func DiffDeadline(pre, cur Deadline) (*DeadlineDiff, error) { func DiffDeadline(pre, cur Deadline) (DeadlineDiff, error) {
changed, err := pre.PartitionsChanged(cur) changed, err := pre.PartitionsChanged(cur)
if err != nil { if err != nil {
return nil, err return nil, err
@ -104,7 +100,7 @@ func DiffDeadline(pre, cur Deadline) (*DeadlineDiff, error) {
return nil, err return nil, err
} }
return &partDiff, nil return partDiff, nil
} }
type PartitionDiff struct { type PartitionDiff struct {

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

@ -274,7 +274,7 @@ func (s *state0) DeadlinesChanged(other State) (bool, error) {
return true, nil return true, nil
} }
return s.State.Deadlines.Equals(other0.Deadlines), nil return !s.State.Deadlines.Equals(other0.Deadlines), nil
} }
func (s *state0) Info() (MinerInfo, error) { func (s *state0) Info() (MinerInfo, error) {
@ -370,7 +370,7 @@ func (d *deadline0) PartitionsChanged(other Deadline) (bool, error) {
return true, nil return true, nil
} }
return d.Deadline.Partitions.Equals(other0.Deadline.Partitions), nil return !d.Deadline.Partitions.Equals(other0.Deadline.Partitions), nil
} }
func (d *deadline0) PostSubmissions() (bitfield.BitField, error) { func (d *deadline0) PostSubmissions() (bitfield.BitField, error) {

4
chain/actors/builtin/miner/v2.go
View File

@ -273,7 +273,7 @@ func (s *state2) DeadlinesChanged(other State) (bool, error) {
return true, nil return true, nil
} }
return s.State.Deadlines.Equals(other2.Deadlines), nil return !s.State.Deadlines.Equals(other2.Deadlines), nil
} }
func (s *state2) Info() (MinerInfo, error) { func (s *state2) Info() (MinerInfo, error) {
@ -369,7 +369,7 @@ func (d *deadline2) PartitionsChanged(other Deadline) (bool, error) {
return true, nil return true, nil
} }
return d.Deadline.Partitions.Equals(other2.Deadline.Partitions), nil return !d.Deadline.Partitions.Equals(other2.Deadline.Partitions), nil
} }
func (d *deadline2) PostSubmissions() (bitfield.BitField, error) { func (d *deadline2) PostSubmissions() (bitfield.BitField, error) {