feat: add proving deadline option view live sectors information #8721
Conversation
thanks for contributing - could you please also add user documentation as suggested in the PR template? |
yes,I will write user documentation later in Discussion Tutorials |
user documentation already added @jennijuju |
cmd/lotus-miner/proving.go
Outdated
| if cctx.Bool("live") { | ||
| for _, partition := range partitions { | ||
| sc, err := partition.LiveSectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sectors += sc | ||
| if sc > 0 { | ||
| PartitionSum++ | ||
| } | ||
|
|
||
| sectors += sc | ||
|
|
||
| fc, err := partition.FaultySectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| faults += fc | ||
|
|
||
| fc, err := partition.FaultySectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } else { | ||
| for _, partition := range partitions { | ||
| PartitionSum++ | ||
|
|
||
| faults += fc | ||
| } | ||
| sc, err := partition.AllSectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sectors += sc | ||
|
|
||
| fc, err := partition.FaultySectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| faults += fc | ||
| } | ||
| } |
There was a problem hiding this comment.
This is too much duplicated code. You should be able to make this work with an if/else statement that either uses partition.LiveSectors.Count() or partition.AllSectors.Count()
cmd/lotus-miner/proving.go
Outdated
| if !cctx.Bool("live") { | ||
| for pIdx, partition := range partitions { | ||
| sectorCount, err := partition.AllSectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| sectorNumbers, err := partition.AllSectors.All(sectorCount) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| sectorNumbers, err := partition.AllSectors.All(sectorCount) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| faultsCount, err := partition.FaultySectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| faultsCount, err := partition.FaultySectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| fn, err := partition.FaultySectors.All(faultsCount) | ||
| if err != nil { | ||
| return err | ||
| fn, err := partition.FaultySectors.All(faultsCount) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| fmt.Printf("Partition Index: %d\n", pIdx) | ||
| fmt.Printf("Sectors: %d\n", sectorCount) | ||
| fmt.Printf("Sector Numbers: %v\n", sectorNumbers) | ||
| fmt.Printf("Faults: %d\n", faultsCount) | ||
| fmt.Printf("Faulty Sectors: %d\n", fn) | ||
| } | ||
| } else { | ||
| for pIdx, partition := range partitions { | ||
| sectorCount, err := partition.LiveSectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| fmt.Printf("Partition Index: %d\n", pIdx) | ||
| fmt.Printf("Sectors: %d\n", sectorCount) | ||
| fmt.Printf("Sector Numbers: %v\n", sectorNumbers) | ||
| fmt.Printf("Faults: %d\n", faultsCount) | ||
| fmt.Printf("Faulty Sectors: %d\n", fn) | ||
| sectorNumbers, err := partition.LiveSectors.All(sectorCount) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| faultsCount, err := partition.FaultySectors.Count() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| fn, err := partition.FaultySectors.All(faultsCount) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| fmt.Printf("Partition Index: %d\n", pIdx) | ||
| fmt.Printf("Sectors: %d\n", sectorCount) | ||
| fmt.Printf("Sector Numbers: %v\n", sectorNumbers) | ||
| fmt.Printf("Faults: %d\n", faultsCount) | ||
| fmt.Printf("Faulty Sectors: %d\n", fn) | ||
| } |
There was a problem hiding this comment.
Same thing here, only put the if/else around the code that is different.
There was a problem hiding this comment.
@geoff-vball Sorry, I originally generated redundant code in order to reduce the number of judgments, and it has been corrected.
Related Issues
Proposed Changes
Additional Info
Checklist
Before you mark the PR ready for review, please make sure that:
<PR type>: <area>: <change being made>fix: mempool: Introduce a cache for valid signaturesPR type: fix, feat, INTERFACE BREAKING CHANGE, CONSENSUS BREAKING, build, chore, ci, docs,perf, refactor, revert, style, testarea: api, chain, state, vm, data transfer, market, mempool, message, block production, multisig, networking, paychan, proving, sealing, wallet, deps