diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-09 02:33:28 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-09 02:33:28 +0800 |
| commit | 9e91579105e94395a108d43ec3ac0ae0e0f139c5 (patch) | |
| tree | 65db0dbb984815d774d74100ddaed0e4e2eab73e /cmd/geth | |
| parent | bba4dcb72f216db531f97474ef636790cc82f318 (diff) | |
| parent | 2547c9c9b70a66f11626cb199f7d288ab1985259 (diff) | |
| download | go-tangerine-9e91579105e94395a108d43ec3ac0ae0e0f139c5.tar go-tangerine-9e91579105e94395a108d43ec3ac0ae0e0f139c5.tar.gz go-tangerine-9e91579105e94395a108d43ec3ac0ae0e0f139c5.tar.bz2 go-tangerine-9e91579105e94395a108d43ec3ac0ae0e0f139c5.tar.lz go-tangerine-9e91579105e94395a108d43ec3ac0ae0e0f139c5.tar.xz go-tangerine-9e91579105e94395a108d43ec3ac0ae0e0f139c5.tar.zst go-tangerine-9e91579105e94395a108d43ec3ac0ae0e0f139c5.zip | |
Merge pull request #1885 from karalabe/olympic-fix
cmd: properly initialize Olympic for all subcommands
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 1889cb2f2..2d2c38ce8 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -340,6 +340,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso } app.Before = func(ctx *cli.Context) error { utils.SetupLogger(ctx) + utils.SetupNetwork(ctx) utils.SetupVM(ctx) utils.SetupEth(ctx) if ctx.GlobalBool(utils.PProfEanbledFlag.Name) { @@ -391,9 +392,6 @@ func makeDefaultExtra() []byte { func run(ctx *cli.Context) { utils.CheckLegalese(utils.MustDataDir(ctx)) - if ctx.GlobalBool(utils.OlympicFlag.Name) { - utils.InitOlympic() - } cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) cfg.ExtraData = makeExtra(ctx) |