some code review

This commit is contained in:
whyrusleeping 2020-01-30 21:10:37 -08:00
parent cda7f08b76
commit d70ebd2ba5
2 changed files with 5 additions and 5 deletions

View File

@ -704,7 +704,7 @@ func checkProofSubmissionsAtH(vmctx types.VMContext, self *StoragePowerState, he
return aerrors.HandleExternalError(err, "iterating miners in proving bucket") return aerrors.HandleExternalError(err, "iterating miners in proving bucket")
} }
if vmctx.BlockHeight() > build.ForkMissingSnowballs { if vmctx.BlockHeight() > build.ForkMissingSnowballs && len(forRemoval) > 0 {
nBucket, err := MinerSetRemove(vmctx.Context(), vmctx, bucket, forRemoval...) nBucket, err := MinerSetRemove(vmctx.Context(), vmctx, bucket, forRemoval...)
if err != nil { if err != nil {

View File

@ -2,12 +2,12 @@ package stmgr
import ( import (
"context" "context"
"math/big"
amt "github.com/filecoin-project/go-amt-ipld/v2" amt "github.com/filecoin-project/go-amt-ipld/v2"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
"github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/state" "github.com/filecoin-project/lotus/chain/state"
"github.com/filecoin-project/lotus/chain/types"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
hamt "github.com/ipfs/go-hamt-ipld" hamt "github.com/ipfs/go-hamt-ipld"
blockstore "github.com/ipfs/go-ipfs-blockstore" blockstore "github.com/ipfs/go-ipfs-blockstore"
@ -70,7 +70,7 @@ func fixTooFewSnowballs(ctx context.Context, sm *StateManager, pstate cid.Cid) (
return cid.Undef, err return cid.Undef, err
} }
sum := new(big.Int) sum := types.NewInt(0)
for _, m := range miners { for _, m := range miners {
mact, err := st.GetActor(m) mact, err := st.GetActor(m)
if err != nil { if err != nil {
@ -85,10 +85,10 @@ func fixTooFewSnowballs(ctx context.Context, sm *StateManager, pstate cid.Cid) (
if mstate.SlashedAt != 0 { if mstate.SlashedAt != 0 {
continue continue
} }
sum = sum.Add(sum, mstate.Power.Int) sum = types.BigAdd(sum, mstate.Power)
} }
spast.TotalStorage.Int = sum spast.TotalStorage = sum
nspahead, err := cst.Put(ctx, &spast) nspahead, err := cst.Put(ctx, &spast)
if err != nil { if err != nil {
return cid.Undef, err return cid.Undef, err