From 5b44a819d3603dda9af43d880f5324989be4da24 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Sun, 21 Aug 2016 23:55:53 +0200 Subject: [PATCH] cmd/utils: removed DAO oppose / support message --- cmd/utils/flags.go | 17 ----------------- 1 file changed, 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 }