Merge branch 'aura-dev' of github.com:goerli/go-ethereum-aura into aura-dev

This commit is contained in:
priom 2018-09-08 11:16:54 -04:00
commit c462f4734a

View file

@ -1351,7 +1351,7 @@ func MakeGenesis(ctx *cli.Context) *core.Genesis {
genesis = core.DefaultRinkebyGenesisBlock() genesis = core.DefaultRinkebyGenesisBlock()
case ctx.GlobalBool(DeveloperFlag.Name): case ctx.GlobalBool(DeveloperFlag.Name):
Fatalf("Developer chains are ephemeral") Fatalf("Developer chains are ephemeral")
case ctx.GlobalBool(GoerliFLag.Name): case ctx.GlobalBool(GoerliFlag.Name):
genesis = core.DefaultGoerliGenesisBlock() genesis = core.DefaultGoerliGenesisBlock()
} }
return genesis return genesis