OSDN Git Service

fix
authormars <mars@bytom.io>
Thu, 25 Jul 2019 07:29:52 +0000 (15:29 +0800)
committermars <mars@bytom.io>
Thu, 25 Jul 2019 07:29:52 +0000 (15:29 +0800)
toolbar/vote_reward/settlementvotereward/settlementreward.go

index da25681..ccdb7c0 100644 (file)
@@ -103,21 +103,19 @@ func (s *SettlementReward) getStandbyNodeReward(height uint64) (uint64, error) {
 
        voteInfos = common.CalcStandByNodes(voteInfos)
 
-       err = errNoStandbyNode
+       if len(voteInfos) == 0 {
+               return 0, errNoStandbyNode
+       }
+
        totalVoteNum := uint64(0)
        xpubVoteNum := uint64(0)
        for _, voteInfo := range voteInfos {
                totalVoteNum += voteInfo.VoteNum
                if s.rewardCfg.XPub == voteInfo.Vote {
                        xpubVoteNum = voteInfo.VoteNum
-                       err = nil
                }
        }
 
-       if err != nil {
-               return 0, err
-       }
-
        amount := big.NewInt(0).SetUint64(standbyNodesRewardForConsensusCycle)
        rewardRatio := big.NewInt(0).SetUint64(s.rewardCfg.RewardRatio)
        amount.Mul(amount, rewardRatio).Div(amount, big.NewInt(100))