Merge branch 'dpos-v2' of https://github.com/zzh33cn/plugin into dpos-v2

plugin/consensus/dpos/dpos.go

@@ -278,7 +278,7 @@ func (client *Client) StartConsensus() {
 		panic(err)
 	}
 OuterLoop:
-	for !DebugCatchup && block != nil{
+	for !DebugCatchup && block != nil {
 		select {
 		case <-hint.C:
 			dposlog.Info("Still catching up max height......", "cost", time.Since(beg))

plugin/consensus/dpos/dpos_test.go

@@ -11,12 +11,13 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/33cn/chain33/common/crypto"
 	"math/rand"
 	"os"
 	"testing"
 	"time"
 
+	"github.com/33cn/chain33/common/crypto"
+
 	"github.com/33cn/chain33/blockchain"
 	"github.com/33cn/chain33/common/address"
 	"github.com/33cn/chain33/common/limits"
@@ -47,8 +48,8 @@ var (
 	strPubkey = "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4"
 	pubkey []byte
 )
-const fee = 1e6
 
+const fee = 1e6
 
 func init() {
 	err := limits.SetLimits()

plugin/consensus/dpos/state_machine.go

@@ -573,7 +573,7 @@ func (voted *VotedState) timeOut(cs *ConsensusState) {
 	block := cs.client.GetCurrentBlock()
 	task := DecideTaskByTime(now)
 
-	dposlog.Info("address info", "privValidatorAddr", hex.EncodeToString(cs.privValidator.GetAddress()), "VotedNodeAddress",hex.EncodeToString(cs.currentVote.VotedNodeAddress))
+	dposlog.Info("address info", "privValidatorAddr", hex.EncodeToString(cs.privValidator.GetAddress()), "VotedNodeAddress", hex.EncodeToString(cs.currentVote.VotedNodeAddress))
 	if bytes.Equal(cs.privValidator.GetAddress(), cs.currentVote.VotedNodeAddress) {
 		//当前节点为出块节点