auto ci

33cn · Mar 11, 2022 · 46acda8 · 46acda8
1 parent be390bc
commit 46acda8
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 20 deletions.
diff --git a/plugin/consensus/dpos/types/signable.go b/plugin/consensus/dpos/types/signable.go
@@ -105,7 +105,7 @@ func (vote *Vote) String() string {
 
 // Verify ...
 func (vote *Vote) Verify(chainID string, pubKey crypto.PubKey) error {
-	addr :=  address.BytesToBtcAddress(address.NormalVer, pubKey.Bytes()).Hash160[:]
+	addr := address.BytesToBtcAddress(address.NormalVer, pubKey.Bytes()).Hash160[:]
 	if !bytes.Equal(addr, vote.VoterNodeAddress) {
 		return ErrVoteInvalidValidatorAddress
 	}
@@ -192,7 +192,7 @@ func (notify *Notify) String() string {
 
 // Verify ...
 func (notify *Notify) Verify(chainID string, pubKey crypto.PubKey) error {
-	addr :=  address.BytesToBtcAddress(address.NormalVer, pubKey.Bytes()).Hash160[:]
+	addr := address.BytesToBtcAddress(address.NormalVer, pubKey.Bytes()).Hash160[:]
 	if !bytes.Equal(addr, notify.NotifyNodeAddress) {
 		return ErrNotifyInvalidValidatorAddress
 	}

diff --git a/plugin/dapp/cross2eth/ebrelayer/relayer/chain33/tx.go b/plugin/dapp/cross2eth/ebrelayer/relayer/chain33/tx.go
@@ -170,7 +170,7 @@ func getTxByHashesRpc(txhex, rpcLaddr string) (string, error) {
 
 func getContractAddr(caller, txhex string) address.Address {
 	return *address.BytesToBtcAddress(address.NormalVer,
-		address.ExecPubKey(caller + ethcommon.Bytes2Hex(common.HexToHash(txhex).Bytes())))
+		address.ExecPubKey(caller+ethcommon.Bytes2Hex(common.HexToHash(txhex).Bytes())))
 }
 
 func deploySingleContract(code []byte, abi, constructorPara, contractName, paraChainName, deployer, rpcLaddr string) (string, error) {

diff --git a/plugin/dapp/evm/commands/evm.go b/plugin/dapp/evm/commands/evm.go
@@ -214,7 +214,7 @@ func calcNewContractAddrCmd() *cobra.Command {
 func calcNewContractAddr(cmd *cobra.Command, args []string) {
 	deployer, _ := cmd.Flags().GetString("deployer")
 	hash, _ := cmd.Flags().GetString("hash")
-	newContractAddr := address.BytesToBtcAddress(address.NormalVer, address.ExecPubKey(deployer + hash))
+	newContractAddr := address.BytesToBtcAddress(address.NormalVer, address.ExecPubKey(deployer+hash))
 	fmt.Println(newContractAddr.String())
 }
 

diff --git a/plugin/dapp/evm/executor/vm/state/statedb.go b/plugin/dapp/evm/executor/vm/state/statedb.go
@@ -74,21 +74,21 @@ type MemoryStateDB struct {
 // 开始执行下一个区块时（执行器框架调用setEnv设置的区块高度发生变更时），会重新创建此DB对象
 func NewMemoryStateDB(StateDB db.KV, LocalDB db.KVDB, CoinsAccount *account.DB, blockHeight int64, api client.QueueProtocolAPI) *MemoryStateDB {
 	mdb := &MemoryStateDB{
-		StateDB:         StateDB,
-		LocalDB:         LocalDB,
-		CoinsAccount:    CoinsAccount,
+		StateDB:      StateDB,
+		LocalDB:      LocalDB,
+		CoinsAccount: CoinsAccount,
 		evmPlatformAddr: address.BytesToBtcAddress(address.NormalVer,
 			address.ExecPubKey(api.GetConfig().ExecName("evm"))).String(),
-		accounts:        make(map[string]*ContractAccount),
-		logs:            make(map[common.Hash][]*model.ContractLog),
-		logSize:         0,
-		preimages:       make(map[common.Hash][]byte),
-		stateDirty:      make(map[string]interface{}),
-		dataDirty:       make(map[string]interface{}),
-		blockHeight:     blockHeight,
-		refund:          0,
-		txIndex:         0,
-		api:             api,
+		accounts:    make(map[string]*ContractAccount),
+		logs:        make(map[common.Hash][]*model.ContractLog),
+		logSize:     0,
+		preimages:   make(map[common.Hash][]byte),
+		stateDirty:  make(map[string]interface{}),
+		dataDirty:   make(map[string]interface{}),
+		blockHeight: blockHeight,
+		refund:      0,
+		txIndex:     0,
+		api:         api,
 	}
 	return mdb
 }

diff --git a/plugin/dapp/evm/rpc/jrpc.go b/plugin/dapp/evm/rpc/jrpc.go
@@ -62,7 +62,7 @@ func (c *Jrpc) CalcNewContractAddr(parm *evm.EvmCalcNewContractAddrReq, result *
 		return types.ErrInvalidParam
 	}
 	newContractAddr := address.BytesToBtcAddress(address.NormalVer,
-		address.ExecPubKey(parm.Caller + parm.Txhash))
+		address.ExecPubKey(parm.Caller+parm.Txhash))
 	*result = newContractAddr.String()
 	return nil
 }
diff --git a/plugin/dapp/multisig/executor/action.go b/plugin/dapp/multisig/executor/action.go
@@ -6,6 +6,7 @@ package executor
 
 import (
 	"encoding/hex"
+
 	"github.com/33cn/chain33/system/address/btc"
 
 	"github.com/33cn/chain33/account"

diff --git a/plugin/dapp/multisig/executor/exec_test.go b/plugin/dapp/multisig/executor/exec_test.go
@@ -5,9 +5,10 @@
 package executor
 
 import (
-	"github.com/33cn/chain33/system/address/btc"
 	"testing"
 
+	"github.com/33cn/chain33/system/address/btc"
+
 	"github.com/33cn/chain33/account"
 	"github.com/33cn/chain33/common"
 	commonlog "github.com/33cn/chain33/common/log"

diff --git a/plugin/dapp/multisig/executor/multisig.go b/plugin/dapp/multisig/executor/multisig.go
@@ -17,6 +17,7 @@ multiSig合约主要实现如下功能：
 import (
 	"bytes"
 	"encoding/hex"
+
 	"github.com/33cn/chain33/system/address/btc"
 
 	"github.com/33cn/chain33/account"

diff --git a/plugin/dapp/privacy/crypto/onetimeed25519.go b/plugin/dapp/privacy/crypto/onetimeed25519.go
@@ -17,7 +17,7 @@ type oneTimeEd25519 struct{}
 
 func init() {
 	crypto.Register(privacytypes.SignNameOnetimeED25519, &oneTimeEd25519{},
-	crypto.WithRegOptionTypeID(privacytypes.OnetimeED25519))
+		crypto.WithRegOptionTypeID(privacytypes.OnetimeED25519))
 }
 
 func (onetime *oneTimeEd25519) GenKey() (crypto.PrivKey, error) {