cmd: no-legacy cache.trie.journal

Signed-off-by: jsvisa <delweng@gmail.com>

cmd/geth/main.go

@@ -97,7 +97,7 @@ var (
 		utils.CacheFlag,
 		utils.CacheDatabaseFlag,
 		utils.CacheTrieFlag,
-		utils.CacheTrieJournalFlag,   // deprecated
+		utils.CacheTrieJournalFlag,
 		utils.CacheTrieRejournalFlag, // deprecated
 		utils.CacheGCFlag,
 		utils.CacheSnapshotFlag,

cmd/utils/flags.go

@@ -465,6 +465,12 @@ var (
 		Value:    15,
 		Category: flags.PerfCategory,
 	}
+	CacheTrieJournalFlag = &cli.StringFlag{
+		Name:     "cache.trie.journal",
+		Usage:    "Disk journal directory for trie cache to survive node restarts",
+		Value:    "trie-journal.rlp",
+		Category: flags.PerfCategory,
+	}
 	CacheGCFlag = &cli.IntFlag{
 		Name:     "cache.gc",
 		Usage:    "Percentage of cache memory allowance to use for trie pruning (default = 25% full mode, 0% archive mode)",

cmd/utils/flags_legacy.go

@@ -35,7 +35,6 @@ var ShowDeprecated = &cli.Command{
 var DeprecatedFlags = []cli.Flag{
 	NoUSBFlag,
 	LegacyWhitelistFlag,
-	CacheTrieJournalFlag,
 	CacheTrieRejournalFlag,
 	LegacyDiscoveryV5Flag,
 	TxLookupLimitFlag,
@@ -60,12 +59,6 @@ var (
 		Category: flags.DeprecatedCategory,
 	}
 	// Deprecated July 2023
-	CacheTrieJournalFlag = &cli.StringFlag{
-		Name:     "cache.trie.journal",
-		Usage:    "Disk journal directory for trie cache to survive node restarts",
-		Value:    "trie-disklayer.rlp",
-		Category: flags.DeprecatedCategory,
-	}
 	CacheTrieRejournalFlag = &cli.DurationFlag{
 		Name:     "cache.trie.rejournal",
 		Usage:    "Time interval to regenerate the trie cache journal",