From ef3ec13eeeea3060e0128cc1716848dbd10cdbe9 Mon Sep 17 00:00:00 2001
From: dean65 <dean950605@gmail.com>
Date: Thu, 28 Apr 2022 14:49:38 +0800
Subject: [PATCH] fix lint error

---
 cmd/utils/flags.go              | 8 ++++----
 core/state/statedb.go           | 2 +-
 eth/handler_trust.go            | 1 +
 eth/protocols/trust/protocol.go | 1 -
 ethclient/ethclient.go          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index e1669fcb12..79ad12dc33 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -123,11 +123,11 @@ var (
 		Usage: "Disable snap protocol",
 	}
 	DisableDiffProtocolFlag = cli.BoolFlag{
-		Name: "disablediffprotocol",
+		Name:  "disablediffprotocol",
 		Usage: "Disable diff protocol",
 	}
 	EnableTrustProtocolFlag = cli.BoolFlag{
-		Name: "enabletrustprotocol",
+		Name:  "enabletrustprotocol",
 		Usage: "Enable trust protocol",
 	}
 	DiffSyncFlag = cli.BoolFlag{
@@ -272,9 +272,9 @@ var (
 		Usage: "The layer of tries trees that keep in memory",
 		Value: 128,
 	}
-	defaultVerifyMode = ethconfig.Defaults.TriesVerifyMode
+	defaultVerifyMode   = ethconfig.Defaults.TriesVerifyMode
 	TriesVerifyModeFlag = TextMarshalerFlag{
-		Name: "tries-verify-mode",
+		Name:  "tries-verify-mode",
 		Usage: `tries verify mode: "local", "full", "insecure", "none"`,
 		Value: &defaultVerifyMode,
 	}
diff --git a/core/state/statedb.go b/core/state/statedb.go
index c294c73667..4c2e12f0b6 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -1611,7 +1611,7 @@ func (s *StateDB) SnapToDiffLayer() ([]common.Address, []types.DiffAccount, []ty
 	for accountHash, storage := range s.snapStorage {
 		keys := make([]string, 0, len(storage))
 		values := make([][]byte, 0, len(storage))
-		for k, _ := range storage {
+		for k := range storage {
 			keys = append(keys, k)
 		}
 		sort.Strings(keys)
diff --git a/eth/handler_trust.go b/eth/handler_trust.go
index 52100144e2..0b116b9255 100644
--- a/eth/handler_trust.go
+++ b/eth/handler_trust.go
@@ -2,6 +2,7 @@ package eth
 
 import (
 	"fmt"
+
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/eth/protocols/trust"
 	"github.com/ethereum/go-ethereum/p2p/enode"
diff --git a/eth/protocols/trust/protocol.go b/eth/protocols/trust/protocol.go
index 2bd7fecc15..e4f98dd324 100644
--- a/eth/protocols/trust/protocol.go
+++ b/eth/protocols/trust/protocol.go
@@ -40,7 +40,6 @@ var (
 	errMsgTooLarge    = errors.New("message too long")
 	errDecode         = errors.New("invalid message")
 	errInvalidMsgCode = errors.New("invalid message code")
-	errUnexpectedMsg  = errors.New("unexpected message code")
 )
 
 // Packet represents a p2p message in the `trust` protocol.
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
index 78f5c6bb14..d4d19ff5f0 100644
--- a/ethclient/ethclient.go
+++ b/ethclient/ethclient.go
@@ -22,12 +22,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/ethereum/go-ethereum/core"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rpc"
 )