From 4ca2e8e7a20185c70dcda433c8215743d7ff4f35 Mon Sep 17 00:00:00 2001 From: jsvisa Date: Fri, 14 Mar 2025 09:59:47 +0000 Subject: [PATCH] apply comments Signed-off-by: jsvisa --- cmd/geth/chaincmd.go | 2 +- cmd/utils/flags.go | 2 +- eth/backend.go | 2 +- eth/ethconfig/config.go | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 744b7dd426..643b88e614 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -223,7 +223,7 @@ func initGenesis(ctx *cli.Context) error { overrides.OverrideVerkle = &v } - chaindb, err := stack.OpenDatabaseWithFreezer(ethconfig.ChainDbName, 0, 0, ctx.String(utils.AncientFlag.Name), ethconfig.ChainDbNamespace, false) + chaindb, err := stack.OpenDatabaseWithFreezer(ethconfig.DatabaseName, 0, 0, ctx.String(utils.AncientFlag.Name), ethconfig.DatabaseNamespace, false) if err != nil { utils.Fatalf("Failed to open database: %v", err) } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 759997a289..d3ff4db0c5 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2029,7 +2029,7 @@ func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb. } chainDb = remotedb.New(client) default: - chainDb, err = stack.OpenDatabaseWithFreezer(ethconfig.ChainDbName, cache, handles, ctx.String(AncientFlag.Name), ethconfig.ChainDbNamespace, readonly) + chainDb, err = stack.OpenDatabaseWithFreezer(ethconfig.DatabaseName, cache, handles, ctx.String(AncientFlag.Name), ethconfig.DatabaseNamespace, readonly) } if err != nil { Fatalf("Could not open database: %v", err) diff --git a/eth/backend.go b/eth/backend.go index 1790e413fd..697bfab633 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -128,7 +128,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) { } log.Info("Allocated trie memory caches", "clean", common.StorageSize(config.TrieCleanCache)*1024*1024, "dirty", common.StorageSize(config.TrieDirtyCache)*1024*1024) - chainDb, err := stack.OpenDatabaseWithFreezer("chaindata", config.DatabaseCache, config.DatabaseHandles, config.DatabaseFreezer, "eth/db/chaindata/", false) + chainDb, err := stack.OpenDatabaseWithFreezer(ethconfig.DatabaseName, config.DatabaseCache, config.DatabaseHandles, config.DatabaseFreezer, ethconfig.DatabaseNamespace, false) if err != nil { return nil, err } diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index c9acea8030..212d7fc340 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -37,11 +37,11 @@ import ( ) const ( - // ChainDbName is the name of the chain database - ChainDbName = "chaindata" + // DatabaseName is the name of the chain database + DatabaseName = "chaindata" - // ChainDbNamespace is the namespace for the chain database - ChainDbNamespace = "eth/db/chaindata/" + // DatabaseNamespace is the namespace for the chain database + DatabaseNamespace = "eth/db/chaindata/" ) // FullNodeGPO contains default gasprice oracle settings for full node.