From 7267f796e673a11fae3b6eda4bea19a8331f6c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 29 Nov 2016 15:50:27 +0200
Subject: cmd: drop DAO related choice flags since ETC diverged

---
 cmd/utils/flags.go | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'cmd/utils/flags.go')

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index abd344df0..01a742d85 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -177,15 +177,6 @@ var (
 		Usage: "Number of trie node generations to keep in memory",
 		Value: int(state.MaxTrieCacheGen),
 	}
-	// Fork settings
-	SupportDAOFork = cli.BoolFlag{
-		Name:  "support-dao-fork",
-		Usage: "Updates the chain rules to support the DAO hard-fork",
-	}
-	OpposeDAOFork = cli.BoolFlag{
-		Name:  "oppose-dao-fork",
-		Usage: "Updates the chain rules to oppose the DAO hard-fork",
-	}
 	// Miner settings
 	MiningEnabledFlag = cli.BoolFlag{
 		Name:  "mine",
@@ -901,13 +892,6 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *params.ChainCon
 			config.ChainId = params.MainNetChainID
 		}
 	}
-	// Force override any existing configs if explicitly requested
-	switch {
-	case ctx.GlobalBool(SupportDAOFork.Name):
-		config.DAOForkSupport = true
-	case ctx.GlobalBool(OpposeDAOFork.Name):
-		config.DAOForkSupport = false
-	}
 	return config
 }
 
-- 
cgit v1.2.3