From 66c3eb2f1a5c6bb4b5a678ce819f9984ac09e246 Mon Sep 17 00:00:00 2001
From: mr_franklin <mr_franklin@126.com>
Date: Mon, 12 Oct 2020 21:02:38 +0800
Subject: [PATCH] accouts, consensus, core: fix some comments (#21617)
---
accounts/accounts.go | 2 +-
accounts/scwallet/wallet.go | 2 +-
accounts/usbwallet/wallet.go | 2 +-
consensus/clique/snapshot_test.go | 2 +-
core/state/state_object.go | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/accounts/accounts.go b/accounts/accounts.go
index 7a14e4e3e..dc85cba17 100644
--- a/accounts/accounts.go
+++ b/accounts/accounts.go
@@ -88,7 +88,7 @@ type Wallet interface {
// to discover non zero accounts and automatically add them to list of tracked
// accounts.
//
- // Note, self derivaton will increment the last component of the specified path
+ // Note, self derivation will increment the last component of the specified path
// opposed to decending into a child path to allow discovering accounts starting
// from non zero components.
//
diff --git a/accounts/scwallet/wallet.go b/accounts/scwallet/wallet.go
index 80009fc5e..85fae8c11 100644
--- a/accounts/scwallet/wallet.go
+++ b/accounts/scwallet/wallet.go
@@ -637,7 +637,7 @@ func (w *Wallet) Derive(path accounts.DerivationPath, pin bool) (accounts.Accoun
// to discover non zero accounts and automatically add them to list of tracked
// accounts.
//
-// Note, self derivaton will increment the last component of the specified path
+// Note, self derivation will increment the last component of the specified path
// opposed to decending into a child path to allow discovering accounts starting
// from non zero components.
//
diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go
index 993c59934..e39c6bdf3 100644
--- a/accounts/usbwallet/wallet.go
+++ b/accounts/usbwallet/wallet.go
@@ -493,7 +493,7 @@ func (w *wallet) Derive(path accounts.DerivationPath, pin bool) (accounts.Accoun
// to discover non zero accounts and automatically add them to list of tracked
// accounts.
//
-// Note, self derivaton will increment the last component of the specified path
+// Note, self derivation will increment the last component of the specified path
// opposed to decending into a child path to allow discovering accounts starting
// from non zero components.
//
diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go
index 3890fc51d..039ba919b 100644
--- a/consensus/clique/snapshot_test.go
+++ b/consensus/clique/snapshot_test.go
@@ -423,7 +423,7 @@ func TestClique(t *testing.T) {
})
// Iterate through the blocks and seal them individually
for j, block := range blocks {
- // Geth the header and prepare it for signing
+ // Get the header and prepare it for signing
header := block.Header()
if j > 0 {
header.ParentHash = blocks[j-1].Hash()
diff --git a/core/state/state_object.go b/core/state/state_object.go
index 26ab67e1a..d0d3b4513 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -299,7 +299,7 @@ func (s *stateObject) updateTrie(db Database) Trie {
if len(s.pendingStorage) == 0 {
return s.trie
}
- // Track the amount of time wasted on updating the storge trie
+ // Track the amount of time wasted on updating the storage trie
if metrics.EnabledExpensive {
defer func(start time.Time) { s.db.StorageUpdates += time.Since(start) }(time.Now())
}
@@ -347,7 +347,7 @@ func (s *stateObject) updateRoot(db Database) {
if s.updateTrie(db) == nil {
return
}
- // Track the amount of time wasted on hashing the storge trie
+ // Track the amount of time wasted on hashing the storage trie
if metrics.EnabledExpensive {
defer func(start time.Time) { s.db.StorageHashes += time.Since(start) }(time.Now())
}
@@ -364,7 +364,7 @@ func (s *stateObject) CommitTrie(db Database) error {
if s.dbErr != nil {
return s.dbErr
}
- // Track the amount of time wasted on committing the storge trie
+ // Track the amount of time wasted on committing the storage trie
if metrics.EnabledExpensive {
defer func(start time.Time) { s.db.StorageCommits += time.Since(start) }(time.Now())
}
--
GitLab