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

plugin/consensus/dpos/dpos_test.go

@@ -12,12 +12,13 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/33cn/chain33/util"
 	"math/rand"
 	"os"
 	"testing"
 	"time"
 
+	"github.com/33cn/chain33/util"
+
 	"github.com/33cn/chain33/blockchain"
 	"github.com/33cn/chain33/common/address"
 	"github.com/33cn/chain33/common/crypto"
@@ -410,7 +411,6 @@ func sendCBTx(cs *ConsensusState, info *dty.DposCBInfo) bool {
 	return true
 }
 
-
 func sendRegistVrfMTx(cs *ConsensusState, info *dty.DposVrfMRegist) bool {
 	tx, err := cs.client.CreateRegVrfMTx(info)
 	if err != nil {
@@ -500,7 +500,7 @@ func sendTopNRegistTx(cs *ConsensusState, reg *dty.TopNCandidatorRegist) bool {
 	return true
 }
 
-func sendTransferTx(fromKey ,to string, amount int64) bool {
+func sendTransferTx(fromKey, to string, amount int64) bool {
 	signer := util.HexToPrivkey(fromKey)
 	var tx *types.Transaction
 	transfer := &cty.CoinsAction{}
@@ -534,7 +534,7 @@ func sendTransferTx(fromKey ,to string, amount int64) bool {
 	return true
 }
 
-func sendTransferToExecTx(fromKey ,execName string, amount int64) bool {
+func sendTransferToExecTx(fromKey, execName string, amount int64) bool {
 	signer := util.HexToPrivkey(fromKey)
 	var tx *types.Transaction
 	transfer := &cty.CoinsAction{}
@@ -571,7 +571,6 @@ func sendTransferToExecTx(fromKey ,execName string, amount int64) bool {
 	return true
 }
 
-
 func sendRegistCandidatorTx(ppubkey, addr, ip, privKey string) bool {
 	signer := util.HexToPrivkey(privKey)
 	var tx *types.Transaction