diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go
index 02d339f99c..4ab14bbcc0 100644
--- a/core/txpool/blobpool/blobpool.go
+++ b/core/txpool/blobpool/blobpool.go
@@ -1751,7 +1751,7 @@ func (p *BlobPool) Clear() {
 	// The transaction addition may attempt to reserve the sender addr which
 	// can't happen until Clear releases the reservation lock.  Clear cannot
 	// acquire the subpool lock until the transaction addition is completed.
-	for acct, _ := range p.index {
+	for acct := range p.index {
 		p.reserve(acct, false)
 	}
 	p.lookup = newLookup()
diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go
index 89ff86df02..181bba2a79 100644
--- a/core/txpool/legacypool/legacypool.go
+++ b/core/txpool/legacypool/legacypool.go
@@ -1986,7 +1986,7 @@ func (pool *LegacyPool) Clear() {
 		senderAddr, _ := types.Sender(pool.signer, tx)
 		pool.reserve(senderAddr, false)
 	}
-	for localSender, _ := range pool.locals.accounts {
+	for localSender := range pool.locals.accounts {
 		pool.reserve(localSender, false)
 	}
 
diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go
index 1f5f2dd1d5..ca410c8fd0 100644
--- a/internal/ethapi/api_test.go
+++ b/internal/ethapi/api_test.go
@@ -798,7 +798,7 @@ func TestCall(t *testing.T) {
 					Balance: big.NewInt(params.Ether),
 					Nonce:   1,
 					Storage: map[common.Hash]common.Hash{
-						common.Hash{}: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001"),
+						{}: common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001"),
 					},
 				},
 			},
diff --git a/triedb/pathdb/states_test.go b/triedb/pathdb/states_test.go
index 4557fa958d..f097e90e81 100644
--- a/triedb/pathdb/states_test.go
+++ b/triedb/pathdb/states_test.go
@@ -28,39 +28,39 @@ import (
 func TestStatesMerge(t *testing.T) {
 	a := newStates(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: {0xa0},
-			common.Hash{0xb}: {0xb0},
-			common.Hash{0xc}: {0xc0},
+			{0xa}: {0xa0},
+			{0xb}: {0xb0},
+			{0xc}: {0xc0},
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: {0x10},
 				common.Hash{0x2}: {0x20},
 			},
-			common.Hash{0xb}: {
+			{0xb}: {
 				common.Hash{0x1}: {0x10},
 			},
-			common.Hash{0xc}: {
+			{0xc}: {
 				common.Hash{0x1}: {0x10},
 			},
 		},
 	)
 	b := newStates(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: {0xa1},
-			common.Hash{0xb}: {0xb1},
-			common.Hash{0xc}: nil, // delete account
+			{0xa}: {0xa1},
+			{0xb}: {0xb1},
+			{0xc}: nil, // delete account
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: {0x11},
 				common.Hash{0x2}: nil, // delete slot
 				common.Hash{0x3}: {0x31},
 			},
-			common.Hash{0xb}: {
+			{0xb}: {
 				common.Hash{0x1}: {0x11},
 			},
-			common.Hash{0xc}: {
+			{0xc}: {
 				common.Hash{0x1}: nil, // delete slot
 			},
 		},
@@ -116,39 +116,39 @@ func TestStatesMerge(t *testing.T) {
 func TestStatesRevert(t *testing.T) {
 	a := newStates(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: {0xa0},
-			common.Hash{0xb}: {0xb0},
-			common.Hash{0xc}: {0xc0},
+			{0xa}: {0xa0},
+			{0xb}: {0xb0},
+			{0xc}: {0xc0},
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: {0x10},
 				common.Hash{0x2}: {0x20},
 			},
-			common.Hash{0xb}: {
+			{0xb}: {
 				common.Hash{0x1}: {0x10},
 			},
-			common.Hash{0xc}: {
+			{0xc}: {
 				common.Hash{0x1}: {0x10},
 			},
 		},
 	)
 	b := newStates(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: {0xa1},
-			common.Hash{0xb}: {0xb1},
-			common.Hash{0xc}: nil,
+			{0xa}: {0xa1},
+			{0xb}: {0xb1},
+			{0xc}: nil,
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: {0x11},
 				common.Hash{0x2}: nil,
 				common.Hash{0x3}: {0x31},
 			},
-			common.Hash{0xb}: {
+			{0xb}: {
 				common.Hash{0x1}: {0x11},
 			},
-			common.Hash{0xc}: {
+			{0xc}: {
 				common.Hash{0x1}: nil,
 			},
 		},
@@ -156,20 +156,20 @@ func TestStatesRevert(t *testing.T) {
 	a.merge(b)
 	a.revertTo(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: {0xa0},
-			common.Hash{0xb}: {0xb0},
-			common.Hash{0xc}: {0xc0},
+			{0xa}: {0xa0},
+			{0xb}: {0xb0},
+			{0xc}: {0xc0},
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: {0x10},
 				common.Hash{0x2}: {0x20},
 				common.Hash{0x3}: nil,
 			},
-			common.Hash{0xb}: {
+			{0xb}: {
 				common.Hash{0x1}: {0x10},
 			},
-			common.Hash{0xc}: {
+			{0xc}: {
 				common.Hash{0x1}: {0x10},
 			},
 		},
@@ -227,14 +227,14 @@ func TestStateRevertAccountNullMarker(t *testing.T) {
 	a := newStates(nil, nil) // empty initial state
 	b := newStates(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: {0xa},
+			{0xa}: {0xa},
 		},
 		nil,
 	)
 	a.merge(b) // create account 0xa
 	a.revertTo(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: nil,
+			{0xa}: nil,
 		},
 		nil,
 	) // revert the transition b
@@ -253,13 +253,13 @@ func TestStateRevertAccountNullMarker(t *testing.T) {
 // entry in the set.
 func TestStateRevertStorageNullMarker(t *testing.T) {
 	a := newStates(map[common.Hash][]byte{
-		common.Hash{0xa}: {0xa},
+		{0xa}: {0xa},
 	}, nil) // initial state with account 0xa
 
 	b := newStates(
 		nil,
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: {0x1},
 			},
 		},
@@ -268,7 +268,7 @@ func TestStateRevertStorageNullMarker(t *testing.T) {
 	a.revertTo(
 		nil,
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: nil,
 			},
 		},
@@ -286,10 +286,10 @@ func TestStateRevertStorageNullMarker(t *testing.T) {
 func TestStatesEncode(t *testing.T) {
 	s := newStates(
 		map[common.Hash][]byte{
-			common.Hash{0x1}: {0x1},
+			{0x1}: {0x1},
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0x1}: {
+			{0x1}: {
 				common.Hash{0x1}: {0x1},
 			},
 		},
@@ -313,18 +313,18 @@ func TestStatesEncode(t *testing.T) {
 func TestStateWithOriginEncode(t *testing.T) {
 	s := NewStateSetWithOrigin(
 		map[common.Hash][]byte{
-			common.Hash{0x1}: {0x1},
+			{0x1}: {0x1},
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0x1}: {
+			{0x1}: {
 				common.Hash{0x1}: {0x1},
 			},
 		},
 		map[common.Address][]byte{
-			common.Address{0x1}: {0x1},
+			{0x1}: {0x1},
 		},
 		map[common.Address]map[common.Hash][]byte{
-			common.Address{0x1}: {
+			{0x1}: {
 				common.Hash{0x1}: {0x1},
 			},
 		},
@@ -359,19 +359,19 @@ func TestStateSizeTracking(t *testing.T) {
 
 	a := newStates(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: {0xa0}, // common.HashLength+1
-			common.Hash{0xb}: {0xb0}, // common.HashLength+1
-			common.Hash{0xc}: {0xc0}, // common.HashLength+1
+			{0xa}: {0xa0}, // common.HashLength+1
+			{0xb}: {0xb0}, // common.HashLength+1
+			{0xc}: {0xc0}, // common.HashLength+1
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: {0x10}, // 2*common.HashLength+1
 				common.Hash{0x2}: {0x20}, // 2*common.HashLength+1
 			},
-			common.Hash{0xb}: {
+			{0xb}: {
 				common.Hash{0x1}: {0x10, 0x11, 0x12}, // 2*common.HashLength+3
 			},
-			common.Hash{0xc}: {
+			{0xc}: {
 				common.Hash{0x1}: {0x10}, // 2*common.HashLength+1
 			},
 		},
@@ -386,21 +386,21 @@ func TestStateSizeTracking(t *testing.T) {
 		3*2*common.HashLength /* storage data of 0xc */
 	b := newStates(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: {0xa1, 0xa1},       // common.HashLength+2
-			common.Hash{0xb}: {0xb1, 0xb1, 0xb1}, // common.HashLength+3
-			common.Hash{0xc}: nil,                // common.HashLength, account deletion
+			{0xa}: {0xa1, 0xa1},       // common.HashLength+2
+			{0xb}: {0xb1, 0xb1, 0xb1}, // common.HashLength+3
+			{0xc}: nil,                // common.HashLength, account deletion
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: {0x11, 0x11, 0x11}, // 2*common.HashLength+3
 				common.Hash{0x3}: {0x31, 0x31},       // 2*common.HashLength+2, slot creation
 			},
-			common.Hash{0xb}: {
+			{0xb}: {
 				common.Hash{0x1}: {0x11, 0x11}, // 2*common.HashLength+2
 				common.Hash{0x2}: {0x22, 0x22}, // 2*common.HashLength+2, slot creation
 			},
 			// The storage of 0xc is entirely removed
-			common.Hash{0xc}: {
+			{0xc}: {
 				common.Hash{0x1}: nil, // 2*common.HashLength, slot deletion
 				common.Hash{0x2}: nil, // 2*common.HashLength, slot deletion
 				common.Hash{0x3}: nil, // 2*common.HashLength, slot deletion
@@ -424,21 +424,21 @@ func TestStateSizeTracking(t *testing.T) {
 	// Revert the set to original status
 	a.revertTo(
 		map[common.Hash][]byte{
-			common.Hash{0xa}: {0xa0},
-			common.Hash{0xb}: {0xb0},
-			common.Hash{0xc}: {0xc0},
+			{0xa}: {0xa0},
+			{0xb}: {0xb0},
+			{0xc}: {0xc0},
 		},
 		map[common.Hash]map[common.Hash][]byte{
-			common.Hash{0xa}: {
+			{0xa}: {
 				common.Hash{0x1}: {0x10},
 				common.Hash{0x2}: {0x20},
 				common.Hash{0x3}: nil, // revert slot creation
 			},
-			common.Hash{0xb}: {
+			{0xb}: {
 				common.Hash{0x1}: {0x10, 0x11, 0x12},
 				common.Hash{0x2}: nil, // revert slot creation
 			},
-			common.Hash{0xc}: {
+			{0xc}: {
 				common.Hash{0x1}: {0x10},
 				common.Hash{0x2}: {0x20}, // resurrected slot
 				common.Hash{0x3}: {0x30}, // resurrected slot