Merge commit '3f907d6a6' into merge/geth-v1.13.4

2023-10-17 09:42:15 -07:00
parent 051e5f5534 3f907d6a6f
commit 5d2d49229b
33 changed files with 476 additions and 455 deletions
@@ -969,17 +969,12 @@ var (
 		DataDirFlag,
 		AncientFlag,
 		RemoteDBFlag,
+		DBEngineFlag,
 		StateSchemeFlag,
 		HttpHeaderFlag,
 	}
 )

-func init() {
-	if rawdb.PebbleEnabled {
-		DatabaseFlags = append(DatabaseFlags, DBEngineFlag)
-	}
-}
-
 // MakeDataDir retrieves the currently requested data directory, terminating
 // if none (or the empty string) is specified. If the node is starting a testnet,
 // then a subdirectory of the specified datadir will be used.