diff options
Diffstat (limited to 'cmd/utils/flags.go')
| -rw-r--r-- | cmd/utils/flags.go | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 067faf3ce..488e7fea2 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -33,6 +33,7 @@ import ( "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/contracts/release" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/crypto" @@ -47,7 +48,6 @@ import ( "github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/pow" - "github.com/ethereum/go-ethereum/release" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/whisper" "gopkg.in/urfave/cli.v1" @@ -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 } |