aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-08-22 21:33:00 +0800
committerGitHub <noreply@github.com>2016-08-22 21:33:00 +0800
commit7d9c5e0f7d7de6d8bef3b1c1ed8350f5a75c446b (patch)
tree4027efd7395133280d00b4f6cc4813724a5133d9 /cmd
parentd8cec35b10e80887aacd68da3d16489bc4cdde69 (diff)
parent5b44a819d3603dda9af43d880f5324989be4da24 (diff)
downloadgo-tangerine-7d9c5e0f7d7de6d8bef3b1c1ed8350f5a75c446b.tar
go-tangerine-7d9c5e0f7d7de6d8bef3b1c1ed8350f5a75c446b.tar.gz
go-tangerine-7d9c5e0f7d7de6d8bef3b1c1ed8350f5a75c446b.tar.bz2
go-tangerine-7d9c5e0f7d7de6d8bef3b1c1ed8350f5a75c446b.tar.lz
go-tangerine-7d9c5e0f7d7de6d8bef3b1c1ed8350f5a75c446b.tar.xz
go-tangerine-7d9c5e0f7d7de6d8bef3b1c1ed8350f5a75c446b.tar.zst
go-tangerine-7d9c5e0f7d7de6d8bef3b1c1ed8350f5a75c446b.zip
Merge pull request #2928 from obscuren/remove-dao-message
cmd/utils: removed DAO oppose / support message
Diffstat (limited to 'cmd')
-rw-r--r--cmd/utils/flags.go17
1 files changed, 0 insertions, 17 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 067faf3ce..de953ff47 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -800,23 +800,6 @@ func MustMakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *core.ChainC
case ctx.GlobalBool(OpposeDAOFork.Name):
config.DAOForkSupport = false
}
- // Temporarilly display a proper message so the user knows which fork its on
- if !ctx.GlobalBool(TestNetFlag.Name) && (genesis == nil || genesis.Hash() == common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")) {
- choice := "SUPPORT"
- if !config.DAOForkSupport {
- choice = "OPPOSE"
- }
- current := fmt.Sprintf("Geth is currently configured to %s the DAO hard-fork!", choice)
- howtoswap := fmt.Sprintf("You can change your choice prior to block #%v with --support-dao-fork or --oppose-dao-fork.", config.DAOForkBlock)
- howtosync := fmt.Sprintf("After the hard-fork block #%v passed, changing chains requires a resync from scratch!", config.DAOForkBlock)
- separator := strings.Repeat("-", len(howtoswap))
-
- glog.V(logger.Warn).Info(separator)
- glog.V(logger.Warn).Info(current)
- glog.V(logger.Warn).Info(howtoswap)
- glog.V(logger.Warn).Info(howtosync)
- glog.V(logger.Warn).Info(separator)
- }
return config
}