ut: fix some broken ut;

lint: fix some golang lint;

Author: 0xbundler

cmd/geth/dbcmd.go

@@ -429,6 +429,9 @@ func inspectTrie(ctx *cli.Context) error {
 			return err
 		}
 		theInspect, err := trie.NewInspector(trieDB, theTrie, blockNumber, jobnum)
+		if err != nil {
+			return err
+		}
 		theInspect.Run()
 		theInspect.DisplayResult()
 	}

cmd/geth/snapshot.go

@@ -21,11 +21,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/ethereum/go-ethereum/core"
 	"os"
 	"path/filepath"
 	"time"
 
+	"github.com/ethereum/go-ethereum/core"
+
 	"github.com/prometheus/tsdb/fileutil"
 
 	"github.com/ethereum/go-ethereum/cmd/utils"

cmd/utils/flags.go

@@ -23,8 +23,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/rlp"
 	"math"
 	"math/big"
 	"net"
@@ -37,6 +35,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/rlp"
+
 	"github.com/fatih/structs"
 	pcsclite "github.com/gballet/go-libpcsclite"
 	gopsutil "github.com/shirou/gopsutil/mem"

core/rawdb/accessors_trie.go

@@ -18,9 +18,10 @@ package rawdb
 
 import (
 	"fmt"
-	"github.com/ethereum/go-ethereum/core/types"
 	"sync"
 
+	"github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethdb"

core/state/database.go

@@ -19,9 +19,10 @@ package state
 import (
 	"errors"
 	"fmt"
-	"github.com/ethereum/go-ethereum/log"
 	"time"
 
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/lru"
 	"github.com/ethereum/go-ethereum/core/rawdb"

core/state/pruner/pruner.go

@@ -22,8 +22,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/ethereum/go-ethereum/params"
-	bloomfilter "github.com/holiman/bloomfilter/v2"
 	"math"
 	"math/big"
 	"os"
@@ -32,6 +30,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ethereum/go-ethereum/params"
+	bloomfilter "github.com/holiman/bloomfilter/v2"
+
 	"github.com/prometheus/tsdb/fileutil"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -683,7 +684,7 @@ func (p *Pruner) Prune(root common.Hash) error {
 
 	// find target header
 	header := p.chainHeader
-	for header != nil && header.Number.Uint64() >= 0 && header.Root != root {
+	for header != nil && header.Root != root {
 		header = rawdb.ReadHeader(p.db, header.ParentHash, header.Number.Uint64()-1)
 	}
 	if header == nil || header.Root != root {

core/state/snapshot/conversion.go

@@ -142,7 +142,7 @@ func TraverseContractTrie(snaptree *Tree, root common.Hash, pruneExpiredTrieCh c
 	// Start to feed leaves
 	for acctIt.Next() {
 		// Fetch the next account and process it concurrently
-		account, err = types.FullAccount(acctIt.(AccountIterator).Account())
+		account, err = types.FullAccount(acctIt.Account())
 		if err != nil {
 			break
 		}

core/state/snapshot/generate_test.go

@@ -582,7 +582,6 @@ func testGenerateWithExtraAccounts(t *testing.T, scheme string) {
 		rawdb.WriteStorageSnapshot(helper.diskdb, key, hashData([]byte("b-key-2")), val)
 		val, _ = rlp.EncodeToBytes([]byte("b-val-3"))
 		rawdb.WriteStorageSnapshot(helper.diskdb, key, hashData([]byte("b-key-3")), val)
-
 	}
 	root := helper.Commit()
 

core/state/snapshot/snapshot_expire_test.go

@@ -1,20 +1,18 @@
 package snapshot
 
 import (
+	"testing"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethdb/memorydb"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 var (
-	accountHash      = common.HexToHash("0x31b67165f56d0ac50814cafa06748fb3b8fccd3c611a8117350e7a49b44ce130")
-	storageHash1     = common.HexToHash("0x0bb2f3e66816c6fd12513f053d5ee034b1fa2d448a1dc8ee7f56e4c87d6c53fe")
-	storageHash2     = common.HexToHash("0x0bb2f3e66816c93e142cd336c411ebd5576a90739bad7ec1ec0d4a63ea0ec1dc")
-	storageShrink1   = common.FromHex("0x0bb2f3e66816c")
-	storageNodeHash1 = common.HexToHash("0xcf0e24cb9417a38ff61d11def23fb0ec041257c81c04dec6156d5e6b30f4ec28")
+	accountHash  = common.HexToHash("0x31b67165f56d0ac50814cafa06748fb3b8fccd3c611a8117350e7a49b44ce130")
+	storageHash1 = common.HexToHash("0x0bb2f3e66816c6fd12513f053d5ee034b1fa2d448a1dc8ee7f56e4c87d6c53fe")
 )
 
 func TestShrinkExpiredLeaf(t *testing.T) {

core/state/snapshot/snapshot_value.go

@@ -3,6 +3,7 @@ package snapshot
 import (
 	"bytes"
 	"errors"
+
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rlp"
 )