From fc371215e0d95adefd6bb83fd1dc84ceb83d5cd9 Mon Sep 17 00:00:00 2001 From: Gary Rong Date: Wed, 11 Oct 2023 16:01:33 +0800 Subject: [PATCH] cmd: reverts --- cmd/geth/chaincmd.go | 4 ++-- cmd/geth/dbcmd.go | 2 +- cmd/geth/snapshot.go | 8 ++++---- cmd/utils/flags.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index f792e18eac..a6bb2c2d2c 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -200,7 +200,7 @@ func initGenesis(ctx *cli.Context) error { } defer chaindb.Close() - triedb := utils.MakeTrieDatabase(ctx.String(utils.StateSchemeFlag.Name), chaindb, ctx.Bool(utils.CachePreimagesFlag.Name), false) + triedb := utils.MakeTrieDatabase(ctx, chaindb, ctx.Bool(utils.CachePreimagesFlag.Name), false) defer triedb.Close() _, hash, err := core.SetupGenesisBlock(chaindb, triedb, genesis) @@ -474,7 +474,7 @@ func dump(ctx *cli.Context) error { if err != nil { return err } - triedb := utils.MakeTrieDatabase(ctx.String(utils.StateSchemeFlag.Name), db, true, true) // always enable preimage lookup + triedb := utils.MakeTrieDatabase(ctx, db, true, true) // always enable preimage lookup defer triedb.Close() state, err := state.New(root, state.NewDatabaseWithNodeDB(db, triedb), nil) diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go index 9794e5b736..6f802716c5 100644 --- a/cmd/geth/dbcmd.go +++ b/cmd/geth/dbcmd.go @@ -482,7 +482,7 @@ func dbDumpTrie(ctx *cli.Context) error { db := utils.MakeChainDatabase(ctx, stack, true) defer db.Close() - triedb := utils.MakeTrieDatabase(ctx.String(utils.StateSchemeFlag.Name), db, false, true) + triedb := utils.MakeTrieDatabase(ctx, db, false, true) defer triedb.Close() var ( diff --git a/cmd/geth/snapshot.go b/cmd/geth/snapshot.go index 8d58735f0d..6413482511 100644 --- a/cmd/geth/snapshot.go +++ b/cmd/geth/snapshot.go @@ -205,7 +205,7 @@ func verifyState(ctx *cli.Context) error { log.Error("Failed to load head block") return errors.New("no head block") } - triedb := utils.MakeTrieDatabase(ctx.String(utils.StateSchemeFlag.Name), chaindb, false, true) + triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true) defer triedb.Close() snapConfig := snapshot.Config{ @@ -260,7 +260,7 @@ func traverseState(ctx *cli.Context) error { chaindb := utils.MakeChainDatabase(ctx, stack, true) defer chaindb.Close() - triedb := utils.MakeTrieDatabase(ctx.String(utils.StateSchemeFlag.Name), chaindb, false, true) + triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true) defer triedb.Close() headBlock := rawdb.ReadHeadBlock(chaindb) @@ -369,7 +369,7 @@ func traverseRawState(ctx *cli.Context) error { chaindb := utils.MakeChainDatabase(ctx, stack, true) defer chaindb.Close() - triedb := utils.MakeTrieDatabase(ctx.String(utils.StateSchemeFlag.Name), chaindb, false, true) + triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true) defer triedb.Close() headBlock := rawdb.ReadHeadBlock(chaindb) @@ -533,7 +533,7 @@ func dumpState(ctx *cli.Context) error { if err != nil { return err } - triedb := utils.MakeTrieDatabase(ctx.String(utils.StateSchemeFlag.Name), db, false, true) + triedb := utils.MakeTrieDatabase(ctx, db, false, true) defer triedb.Close() snapConfig := snapshot.Config{ diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index fdd9d8f989..f24ca66581 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2218,11 +2218,11 @@ func MakeConsolePreloads(ctx *cli.Context) []string { } // MakeTrieDatabase constructs a trie database based on the configured scheme. -func MakeTrieDatabase(provided string, disk ethdb.Database, preimage bool, readOnly bool) *trie.Database { +func MakeTrieDatabase(ctx *cli.Context, disk ethdb.Database, preimage bool, readOnly bool) *trie.Database { config := &trie.Config{ Preimages: preimage, } - scheme, err := rawdb.ParseStateScheme(provided, disk) + scheme, err := rawdb.ParseStateScheme(ctx.String(StateSchemeFlag.Name), disk) if err != nil { Fatalf("%v", err) }