diff options
| author | Felix Lange <fjl@twurst.com> | 2016-04-02 03:55:30 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-04-02 03:59:35 +0800 |
| commit | cf842b3fe5ad497ef8dfd24c9179bc2fadbc707f (patch) | |
| tree | 394b3366a84ed3460233848849e84a96025fb2d4 | |
| parent | 78b70d79ecdf9cde1b38855101840b19e365935c (diff) | |
| download | dexon-cf842b3fe5ad497ef8dfd24c9179bc2fadbc707f.tar.gz dexon-cf842b3fe5ad497ef8dfd24c9179bc2fadbc707f.tar.zst dexon-cf842b3fe5ad497ef8dfd24c9179bc2fadbc707f.zip | |
cmd/geth, eth: move --genesis deprecation warning to cmd/geth
This prevents display of the warning for --dev and --olympic.
| -rw-r--r-- | cmd/geth/main.go | 6 | ||||
| -rw-r--r-- | eth/backend.go | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 5d5ab4559..3a6366f4d 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -359,6 +359,12 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso go metrics.CollectProcessMetrics(3 * time.Second) utils.SetupNetwork(ctx) + + // Deprecation warning. + if ctx.GlobalIsSet(utils.GenesisFileFlag.Name) { + common.PrintDepricationWarning("--genesis is deprecated. Switch to use 'geth init /path/to/file'") + } + return nil } diff --git a/eth/backend.go b/eth/backend.go index 3c3440a53..26af7ff91 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -169,10 +169,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { // Load up any custom genesis block if requested if len(config.Genesis) > 0 { - // Using println instead of glog to make sure it **always** displays regardless of - // verbosity settings. - common.PrintDepricationWarning("--genesis is deprecated. Switch to use 'geth init /path/to/file'") - block, err := core.WriteGenesisBlock(chainDb, strings.NewReader(config.Genesis)) if err != nil { return nil, err |