@@ -221,22 +221,23 @@ func initGenesis(ctx *cli.Context) error {
221221 v := ctx .Uint64 (utils .OverrideVerkle .Name )
222222 overrides .OverrideVerkle = & v
223223 }
224- for _ , name := range []string {"chaindata" , "lightchaindata" } {
225- chaindb , err := stack .OpenDatabaseWithFreezer (name , 0 , 0 , ctx .String (utils .AncientFlag .Name ), "" , false )
226- if err != nil {
227- utils .Fatalf ("Failed to open database: %v" , err )
228- }
229- defer chaindb .Close ()
230224
231- triedb := utils .MakeTrieDatabase (ctx , chaindb , ctx .Bool (utils .CachePreimagesFlag .Name ), false , genesis .IsVerkle ())
232- defer triedb .Close ()
225+ chaindb , err := stack .OpenDatabaseWithFreezer ("chaindata" , 0 , 0 , ctx .String (utils .AncientFlag .Name ), "" , false )
226+ if err != nil {
227+ utils .Fatalf ("Failed to open database: %v" , err )
228+ }
229+ defer chaindb .Close ()
230+
231+ triedb := utils .MakeTrieDatabase (ctx , chaindb , ctx .Bool (utils .CachePreimagesFlag .Name ), false , genesis .IsVerkle ())
232+ defer triedb .Close ()
233233
234- _ , hash , err := core .SetupGenesisBlockWithOverride (chaindb , triedb , genesis , & overrides )
235- if err != nil {
236- utils .Fatalf ("Failed to write genesis block: %v" , err )
237- }
238- log .Info ("Successfully wrote genesis state" , "database" , name , "hash" , hash )
234+ _ , hash , err := core .SetupGenesisBlockWithOverride (chaindb , triedb , genesis , & overrides )
235+ if err != nil {
236+ utils .Fatalf ("Failed to write genesis block: %v" , err )
239237 }
238+
239+ log .Info ("Successfully wrote genesis state" , "database" , "chaindata" , "hash" , hash )
240+
240241 return nil
241242}
242243
@@ -258,29 +259,22 @@ func dumpGenesis(ctx *cli.Context) error {
258259
259260 // dump whatever already exists in the datadir
260261 stack , _ := makeConfigNode (ctx )
261- for _ , name := range []string {"chaindata" , "lightchaindata" } {
262- db , err := stack .OpenDatabase (name , 0 , 0 , "" , true )
263- if err != nil {
264- if ! os .IsNotExist (err ) {
265- return err
266- }
267- continue
268- }
269- genesis , err := core .ReadGenesis (db )
270- if err != nil {
271- utils .Fatalf ("failed to read genesis: %s" , err )
272- }
273- db .Close ()
274262
275- if err := json .NewEncoder (os .Stdout ).Encode (* genesis ); err != nil {
276- utils .Fatalf ("could not encode stored genesis: %s" , err )
277- }
278- return nil
263+ db , err := stack .OpenDatabase ("chaindata" , 0 , 0 , "" , true )
264+ if err != nil {
265+ return err
279266 }
280- if ctx .IsSet (utils .DataDirFlag .Name ) {
281- utils .Fatalf ("no existing datadir at %s" , stack .Config ().DataDir )
267+ defer db .Close ()
268+
269+ genesis , err = core .ReadGenesis (db )
270+ if err != nil {
271+ utils .Fatalf ("failed to read genesis: %s" , err )
282272 }
283- utils .Fatalf ("no network preset provided, and no genesis exists in the default datadir" )
273+
274+ if err := json .NewEncoder (os .Stdout ).Encode (* genesis ); err != nil {
275+ utils .Fatalf ("could not encode stored genesis: %s" , err )
276+ }
277+
284278 return nil
285279}
286280
@@ -557,7 +551,7 @@ func parseDumpConfig(ctx *cli.Context, db ethdb.Database) (*state.DumpConfig, co
557551 default :
558552 return nil , common.Hash {}, fmt .Errorf ("invalid start argument: %x. 20 or 32 hex-encoded bytes required" , startArg )
559553 }
560- var conf = & state.DumpConfig {
554+ conf : = & state.DumpConfig {
561555 SkipCode : ctx .Bool (utils .ExcludeCodeFlag .Name ),
562556 SkipStorage : ctx .Bool (utils .ExcludeStorageFlag .Name ),
563557 OnlyWithAddresses : ! ctx .Bool (utils .IncludeIncompletesFlag .Name ),
0 commit comments