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

address review

Browse Source
This commit is contained in:
Łukasz Magiera 2021-09-07 19:42:52 +02:00
parent 8b9e9fede4
commit dfc039276d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/lotus-miner/sectors.go
View File

@ -396,18 +396,20 @@ var sectorsListCmd = &cli.Command{
_, inSSet := commitedIDs[s] _, inSSet := commitedIDs[s]
_, inASet := activeIDs[s] _, inASet := activeIDs[s]
const verifiedPowerGainMul = 9
dw, vp := .0, .0 dw, vp := .0, .0
estimate := st.Expiration-st.Activation <= 0 estimate := st.Expiration-st.Activation <= 0
if !estimate { if !estimate {
rdw := big.Add(st.DealWeight, st.VerifiedDealWeight) rdw := big.Add(st.DealWeight, st.VerifiedDealWeight)
dw = float64(big.Div(rdw, big.NewInt(int64(st.Expiration-st.Activation))).Uint64()) dw = float64(big.Div(rdw, big.NewInt(int64(st.Expiration-st.Activation))).Uint64())
vp = float64(big.Div(big.Mul(st.VerifiedDealWeight, big.NewInt(9)), big.NewInt(int64(st.Expiration-st.Activation))).Uint64()) vp = float64(big.Div(big.Mul(st.VerifiedDealWeight, big.NewInt(verifiedPowerGainMul)), big.NewInt(int64(st.Expiration-st.Activation))).Uint64())
} else { } else {
for _, piece := range st.Pieces { for _, piece := range st.Pieces {
if piece.DealInfo != nil { if piece.DealInfo != nil {
dw += float64(piece.Piece.Size) dw += float64(piece.Piece.Size)
if piece.DealInfo.DealProposal != nil && piece.DealInfo.DealProposal.VerifiedDeal { if piece.DealInfo.DealProposal != nil && piece.DealInfo.DealProposal.VerifiedDeal {
vp += float64(piece.Piece.Size) * 9 vp += float64(piece.Piece.Size) * verifiedPowerGainMul
} }
} }
} }
@ -494,7 +496,7 @@ var sectorsListCmd = &cli.Command{
start := time.Unix(int64(st.Log[0].Timestamp), 0) start := time.Unix(int64(st.Log[0].Timestamp), 0)
for _, sectorLog := range st.Log { for _, sectorLog := range st.Log {
if sectorLog.Kind == "event;sealing.SectorProving" { if sectorLog.Kind == "event;sealing.SectorProving" { // todo: figure out a good way to not hardcode
end := time.Unix(int64(sectorLog.Timestamp), 0) end := time.Unix(int64(sectorLog.Timestamp), 0)
dur := end.Sub(start) dur := end.Sub(start)