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

reduce redundant code

Browse Source
This commit is contained in:
beck 2022-07-20 10:21:52 +08:00
parent 43ec14fa9c
commit 6583a44a92
1 changed files with 40 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
cmd/lotus-miner/proving.go
View File

@ -249,8 +249,8 @@ var provingDeadlinesCmd = &cli.Command{
faults := uint64(0) faults := uint64(0)
var PartitionSum int var PartitionSum int
if cctx.Bool("live") { for _, partition := range partitions {
for _, partition := range partitions { if cctx.Bool("live") {
sc, err := partition.LiveSectors.Count() sc, err := partition.LiveSectors.Count()
if err != nil { if err != nil {
return err return err
@ -261,34 +261,24 @@ var provingDeadlinesCmd = &cli.Command{
} }
sectors += sc sectors += sc
} else {
fc, err := partition.FaultySectors.Count()
if err != nil {
return err
}
faults += fc
}
} else {
for _, partition := range partitions {
PartitionSum++
sc, err := partition.AllSectors.Count() sc, err := partition.AllSectors.Count()
if err != nil { if err != nil {
return err return err
} }
PartitionSum++
sectors += sc sectors += sc
fc, err := partition.FaultySectors.Count()
if err != nil {
return err
}
faults += fc
} }
fc, err := partition.FaultySectors.Count()
if err != nil {
return err
}
faults += fc
} }
var cur string var cur string
if di.Index == uint64(dlIdx) { if di.Index == uint64(dlIdx) {
cur += "\t(current)" cur += "\t(current)"
@ -361,64 +351,52 @@ var provingDeadlineInfoCmd = &cli.Command{
fmt.Printf("Proven Partitions: %d\n", provenPartitions) fmt.Printf("Proven Partitions: %d\n", provenPartitions)
fmt.Printf("Current: %t\n\n", di.Index == dlIdx) fmt.Printf("Current: %t\n\n", di.Index == dlIdx)
if !cctx.Bool("live") { var sectorCount uint64
for pIdx, partition := range partitions { var sectorNumbers []uint64
sectorCount, err := partition.AllSectors.Count()
for pIdx, partition := range partitions {
if !cctx.Bool("live") {
sectorCount, err = partition.AllSectors.Count()
if err != nil { if err != nil {
return err return err
} }
sectorNumbers, err := partition.AllSectors.All(sectorCount) sectorNumbers, err = partition.AllSectors.All(sectorCount)
if err != nil { if err != nil {
return err return err
} }
faultsCount, err := partition.FaultySectors.Count() } else {
sectorCount, err = partition.LiveSectors.Count()
if err != nil { if err != nil {
return err return err
} }
fn, err := partition.FaultySectors.All(faultsCount) if sectorCount != 0 {
if err != nil { sectorNumbers, err = partition.LiveSectors.All(sectorCount)
return err 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
}
sectorNumbers, err := partition.LiveSectors.All(sectorCount) faultsCount, err := partition.FaultySectors.Count()
if err != nil { if err != nil {
return err 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)
} }
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)
} }
return nil return nil
}, },
} }