From b2b0e1da8cac279bf0466885d1abdc5d93402f41 Mon Sep 17 00:00:00 2001
From: haoran <159284258+hr98w@users.noreply.github.com>
Date: Tue, 23 Apr 2024 18:09:42 +0800
Subject: [PATCH] all: fix various typos (#29600)

* core: fix typo

* rpc: fix typo

* snap: fix typo

* trie: fix typo

* main: fix typo

* abi: fix typo

* main: fix field comment for basicOp
---
 accounts/abi/type_test.go              | 2 +-
 core/blockchain_insert.go              | 2 +-
 core/state/iterator.go                 | 2 +-
 core/state/snapshot/context.go         | 2 +-
 core/state/snapshot/iterator_binary.go | 4 ++--
 core/state/snapshot/iterator_fast.go   | 2 +-
 core/state/snapshot/snapshot.go        | 2 +-
 core/state/state_object.go             | 2 +-
 eth/protocols/snap/gentrie.go          | 2 +-
 rlp/rlpgen/gen.go                      | 2 +-
 rpc/subscription.go                    | 2 +-
 rpc/types.go                           | 2 +-
 trie/errors.go                         | 2 +-
 trie/proof.go                          | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go
index ae69872ad8..95922548c4 100644
--- a/accounts/abi/type_test.go
+++ b/accounts/abi/type_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-// typeWithoutStringer is a alias for the Type type which simply doesn't implement
+// typeWithoutStringer is an alias for the Type type which simply doesn't implement
 // the stringer interface to allow printing type details in the tests below.
 type typeWithoutStringer Type
 
diff --git a/core/blockchain_insert.go b/core/blockchain_insert.go
index c7c4c4bfea..49e913aada 100644
--- a/core/blockchain_insert.go
+++ b/core/blockchain_insert.go
@@ -170,7 +170,7 @@ func (it *insertIterator) current() *types.Header {
 	return it.chain[it.index].Header()
 }
 
-// first returns the first block in the it.
+// first returns the first block in it.
 func (it *insertIterator) first() *types.Block {
 	return it.chain[0]
 }
diff --git a/core/state/iterator.go b/core/state/iterator.go
index dc84ce689b..83c552ca1a 100644
--- a/core/state/iterator.go
+++ b/core/state/iterator.go
@@ -46,7 +46,7 @@ type nodeIterator struct {
 	Error error // Failure set in case of an internal error in the iterator
 }
 
-// newNodeIterator creates an post-order state node iterator.
+// newNodeIterator creates a post-order state node iterator.
 func newNodeIterator(state *StateDB) *nodeIterator {
 	return &nodeIterator{
 		state: state,
diff --git a/core/state/snapshot/context.go b/core/state/snapshot/context.go
index 67d7e41a03..8a19960501 100644
--- a/core/state/snapshot/context.go
+++ b/core/state/snapshot/context.go
@@ -46,7 +46,7 @@ type generatorStats struct {
 	storage  common.StorageSize // Total account and storage slot size(generation or recovery)
 }
 
-// Log creates an contextual log with the given message and the context pulled
+// Log creates a contextual log with the given message and the context pulled
 // from the internally maintained statistics.
 func (gs *generatorStats) Log(msg string, root common.Hash, marker []byte) {
 	var ctx []interface{}
diff --git a/core/state/snapshot/iterator_binary.go b/core/state/snapshot/iterator_binary.go
index 22184b2545..edf471213f 100644
--- a/core/state/snapshot/iterator_binary.go
+++ b/core/state/snapshot/iterator_binary.go
@@ -68,7 +68,7 @@ func (dl *diffLayer) initBinaryStorageIterator(account common.Hash) Iterator {
 	parent, ok := dl.parent.(*diffLayer)
 	if !ok {
 		// If the storage in this layer is already destructed, discard all
-		// deeper layers but still return an valid single-branch iterator.
+		// deeper layers but still return a valid single-branch iterator.
 		a, destructed := dl.StorageIterator(account, common.Hash{})
 		if destructed {
 			l := &binaryIterator{
@@ -92,7 +92,7 @@ func (dl *diffLayer) initBinaryStorageIterator(account common.Hash) Iterator {
 		return l
 	}
 	// If the storage in this layer is already destructed, discard all
-	// deeper layers but still return an valid single-branch iterator.
+	// deeper layers but still return a valid single-branch iterator.
 	a, destructed := dl.StorageIterator(account, common.Hash{})
 	if destructed {
 		l := &binaryIterator{
diff --git a/core/state/snapshot/iterator_fast.go b/core/state/snapshot/iterator_fast.go
index 9b018bac56..fa0daea7ba 100644
--- a/core/state/snapshot/iterator_fast.go
+++ b/core/state/snapshot/iterator_fast.go
@@ -25,7 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-// weightedIterator is a iterator with an assigned weight. It is used to prioritise
+// weightedIterator is an iterator with an assigned weight. It is used to prioritise
 // which account or storage slot is the correct one if multiple iterators find the
 // same one (modified in multiple consecutive blocks).
 type weightedIterator struct {
diff --git a/core/state/snapshot/snapshot.go b/core/state/snapshot/snapshot.go
index 5c38cb7252..89a4c16c20 100644
--- a/core/state/snapshot/snapshot.go
+++ b/core/state/snapshot/snapshot.go
@@ -835,7 +835,7 @@ func (t *Tree) disklayer() *diskLayer {
 	}
 }
 
-// diskRoot is a internal helper function to return the disk layer root.
+// diskRoot is an internal helper function to return the disk layer root.
 // The lock of snapTree is assumed to be held already.
 func (t *Tree) diskRoot() common.Hash {
 	disklayer := t.disklayer()
diff --git a/core/state/state_object.go b/core/state/state_object.go
index 1aa7946fd0..db3c32f2f2 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -376,7 +376,7 @@ func (s *stateObject) updateTrie() (Trie, error) {
 // new storage trie root.
 func (s *stateObject) updateRoot() {
 	// Flush cached storage mutations into trie, short circuit if any error
-	// is occurred or there is not change in the trie.
+	// is occurred or there is no change in the trie.
 	tr, err := s.updateTrie()
 	if err != nil || tr == nil {
 		return
diff --git a/eth/protocols/snap/gentrie.go b/eth/protocols/snap/gentrie.go
index 8ef1a00753..81c2640b62 100644
--- a/eth/protocols/snap/gentrie.go
+++ b/eth/protocols/snap/gentrie.go
@@ -132,7 +132,7 @@ func (t *pathTrie) onTrieNode(path []byte, hash common.Hash, blob []byte) {
 	//
 	// The extension node is detected if its path is the prefix of last committed
 	// one and path gap is larger than one. If the path gap is only one byte,
-	// the current node could either be a full node, or a extension with single
+	// the current node could either be a full node, or an extension with single
 	// byte key. In either case, no gaps will be left in the path.
 	if t.last != nil && bytes.HasPrefix(t.last, path) && len(t.last)-len(path) > 1 {
 		for i := len(path) + 1; i < len(t.last); i++ {
diff --git a/rlp/rlpgen/gen.go b/rlp/rlpgen/gen.go
index 0c65864826..ff39874737 100644
--- a/rlp/rlpgen/gen.go
+++ b/rlp/rlpgen/gen.go
@@ -158,7 +158,7 @@ type op interface {
 // basicOp handles basic types bool, uint*, string.
 type basicOp struct {
 	typ           types.Type
-	writeMethod   string     // calle write the value
+	writeMethod   string     // EncoderBuffer writer method name
 	writeArgType  types.Type // parameter type of writeMethod
 	decMethod     string
 	decResultType types.Type // return type of decMethod
diff --git a/rpc/subscription.go b/rpc/subscription.go
index d3dff32a27..d77c655bf9 100644
--- a/rpc/subscription.go
+++ b/rpc/subscription.go
@@ -97,7 +97,7 @@ func NotifierFromContext(ctx context.Context) (*Notifier, bool) {
 	return n, ok
 }
 
-// Notifier is tied to a RPC connection that supports subscriptions.
+// Notifier is tied to an RPC connection that supports subscriptions.
 // Server callbacks use the notifier to send notifications.
 type Notifier struct {
 	h         *handler
diff --git a/rpc/types.go b/rpc/types.go
index d124081786..2e53174b87 100644
--- a/rpc/types.go
+++ b/rpc/types.go
@@ -38,7 +38,7 @@ type API struct {
 }
 
 // ServerCodec implements reading, parsing and writing RPC messages for the server side of
-// a RPC session. Implementations must be go-routine safe since the codec can be called in
+// an RPC session. Implementations must be go-routine safe since the codec can be called in
 // multiple go-routines concurrently.
 type ServerCodec interface {
 	peerInfo() PeerInfo
diff --git a/trie/errors.go b/trie/errors.go
index 7be7041c7f..ce5cb13423 100644
--- a/trie/errors.go
+++ b/trie/errors.go
@@ -23,7 +23,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-// ErrCommitted is returned when a already committed trie is requested for usage.
+// ErrCommitted is returned when an already committed trie is requested for usage.
 // The potential usages can be `Get`, `Update`, `Delete`, `NodeIterator`, `Prove`
 // and so on.
 var ErrCommitted = errors.New("trie is already committed")
diff --git a/trie/proof.go b/trie/proof.go
index fd892fb4be..a39d6b4ea3 100644
--- a/trie/proof.go
+++ b/trie/proof.go
@@ -372,7 +372,7 @@ func unset(parent node, child node, key []byte, pos int, removeLeft bool) error
 		return unset(cld, cld.Children[key[pos]], key, pos+1, removeLeft)
 	case *shortNode:
 		if len(key[pos:]) < len(cld.Key) || !bytes.Equal(cld.Key, key[pos:pos+len(cld.Key)]) {
-			// Find the fork point, it's an non-existent branch.
+			// Find the fork point, it's a non-existent branch.
 			if removeLeft {
 				if bytes.Compare(cld.Key, key[pos:]) < 0 {
 					// The key of fork shortnode is less than the path