From 1ff152f3a43e4adf030ac61eb5d8da345554fc5a Mon Sep 17 00:00:00 2001
From: Corey Lin <514971757@qq.com>
Date: Fri, 9 Nov 2018 18:51:07 +0800
Subject: [PATCH] rawdb: remove unused parameter for WritePreimages func
(#18059)
* rawdb: remove unused parameter for WritePreimages func and modify a
spelling mistake
* rawdb: update the doc for function WritePreimages
---
cmd/utils/cmd.go | 4 ++--
core/blockchain.go | 2 +-
core/rawdb/accessors_metadata.go | 5 ++---
core/rawdb/schema.go | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 58d72f32b..f23aa5775 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -272,13 +272,13 @@ func ImportPreimages(db *ethdb.LDBDatabase, fn string) error {
// Accumulate the preimages and flush when enough ws gathered
preimages[crypto.Keccak256Hash(blob)] = common.CopyBytes(blob)
if len(preimages) > 1024 {
- rawdb.WritePreimages(db, 0, preimages)
+ rawdb.WritePreimages(db, preimages)
preimages = make(map[common.Hash][]byte)
}
}
// Flush the last batch preimage data
if len(preimages) > 0 {
- rawdb.WritePreimages(db, 0, preimages)
+ rawdb.WritePreimages(db, preimages)
}
return nil
}
diff --git a/core/blockchain.go b/core/blockchain.go
index f4a818f4c..1b0c26ae2 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -1002,7 +1002,7 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
}
// Write the positional metadata for transaction/receipt lookups and preimages
rawdb.WriteTxLookupEntries(batch, block)
- rawdb.WritePreimages(batch, block.NumberU64(), state.Preimages())
+ rawdb.WritePreimages(batch, state.Preimages())
status = CanonStatTy
} else {
diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go
index 514328e87..3b6e6548d 100644
--- a/core/rawdb/accessors_metadata.go
+++ b/core/rawdb/accessors_metadata.go
@@ -77,9 +77,8 @@ func ReadPreimage(db DatabaseReader, hash common.Hash) []byte {
return data
}
-// WritePreimages writes the provided set of preimages to the database. `number` is the
-// current block number, and is used for debug messages only.
-func WritePreimages(db DatabaseWriter, number uint64, preimages map[common.Hash][]byte) {
+// WritePreimages writes the provided set of preimages to the database.
+func WritePreimages(db DatabaseWriter, preimages map[common.Hash][]byte) {
for hash, preimage := range preimages {
if err := db.Put(preimageKey(hash), preimage); err != nil {
log.Crit("Failed to store trie preimage", "err", err)
diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go
index ef597ef30..8a9921ef4 100644
--- a/core/rawdb/schema.go
+++ b/core/rawdb/schema.go
@@ -35,7 +35,7 @@ var (
// headBlockKey tracks the latest know full block's hash.
headBlockKey = []byte("LastBlock")
- // headFastBlockKey tracks the latest known incomplete block's hash duirng fast sync.
+ // headFastBlockKey tracks the latest known incomplete block's hash during fast sync.
headFastBlockKey = []byte("LastFast")
// fastTrieProgressKey tracks the number of trie entries imported during fast sync.
--
GitLab