Revert "Add consensus result test case"

[bytom/vapor.git] / protocol / state / consensus_result.go

diff --git a/protocol/state/consensus_result.go b/protocol/state/consensus_result.go
index d392e1c..9fd571b 100644 (file)
--- a/protocol/state/consensus_result.go
+++ b/protocol/state/consensus_result.go
@@ -4,8 +4,6 @@ import (
        "encoding/hex"
        "sort"
 
-       log "github.com/sirupsen/logrus"
-
        "github.com/vapor/common/arithmetic"
        "github.com/vapor/config"
        "github.com/vapor/consensus"
@@ -16,8 +14,6 @@ import (
        "github.com/vapor/protocol/bc/types"
 )
 
-const logModule = "state/consensus"
-
 // fedConsensusPath is used to derive federation root xpubs for signing blocks
 var fedConsensusPath = [][]byte{
        []byte{0xff, 0xff, 0xff, 0xff},
@@ -73,11 +69,7 @@ func CalCoinbaseReward(block *types.Block) (*CoinbaseReward, error) {
                        return nil, errors.Wrap(checked.ErrOverflow, "calculate transaction fee")
                }
 
-               ok := false
-               result.Amount, ok = checked.AddUint64(result.Amount, txFee)
-               if !ok {
-                       return nil, checked.ErrOverflow
-               }
+               result.Amount += txFee
        }
        return result, nil
 }
@@ -188,9 +180,7 @@ func (c *ConsensusResult) ConsensusNodes() (map[string]*ConsensusNode, error) {
                if voteNum >= consensus.ActiveNetParams.MinConsensusNodeVoteNum {
                        var xpub chainkd.XPub
                        if err := xpub.UnmarshalText([]byte(pubkey)); err != nil {
-                               log.WithFields(log.Fields{"module": logModule, "err": err, "XPub": xpub.String()}).Debug("failed on unmarshal XPub")
-                               delete(c.NumOfVote, pubkey)
-                               continue
+                               return nil, err
                        }
 
                        nodes = append(nodes, &ConsensusNode{XPub: xpub, VoteNum: voteNum})