[release/1.4.8] core: update DAO soft-fork number, clean up the code

(cherry picked from commit ba784bdf36)
2016-06-23 12:47:15 +03:00
parent f31a3a251a
commit aefffc9ed8
10 changed files with 49 additions and 67 deletions
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@ -169,6 +169,7 @@ participating.
 		utils.MiningGPUFlag,
 		utils.AutoDAGFlag,
 		utils.TargetGasLimitFlag,
+		utils.DAOSoftForkFlag,
 		utils.NATFlag,
 		utils.NatspecEnabledFlag,
 		utils.NoDiscoverFlag,
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@ -128,6 +128,7 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.TargetGasLimitFlag,
 			utils.GasPriceFlag,
 			utils.ExtraDataFlag,
+			utils.DAOSoftForkFlag,
 		},
 	},
 	{