From 2b03b31d46e166e70ea82b806db47bb6408282e3 Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Mon, 14 Jan 2019 19:59:57 +0800 Subject: params: write dMoment into ChainConfig (#150) --- cmd/gdex/main.go | 1 - cmd/utils/flags.go | 14 -------------- 2 files changed, 15 deletions(-) (limited to 'cmd') diff --git a/cmd/gdex/main.go b/cmd/gdex/main.go index 8e08e2d77..a2597c098 100644 --- a/cmd/gdex/main.go +++ b/cmd/gdex/main.go @@ -98,7 +98,6 @@ var ( utils.MaxPeersFlag, utils.MaxPendingPeersFlag, utils.BlockProposerEnabledFlag, - utils.ConsensusDMomentFlag, utils.MiningEnabledFlag, utils.MinerThreadsFlag, utils.MinerLegacyThreadsFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index bfe565c30..d26bbb065 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -326,10 +326,6 @@ var ( Name: "bp", Usage: "Enable block proposer mode (node set)", } - ConsensusDMomentFlag = cli.Uint64Flag{ - Name: "dmoment", - Usage: "Set the DMoment of DEXON Consensus (unix timestamp)", - } // Miner settings MiningEnabledFlag = cli.BoolFlag{ Name: "mine", @@ -1288,16 +1284,6 @@ func SetDexConfig(ctx *cli.Context, stack *node.Node, cfg *dex.Config) { if gen := ctx.GlobalInt(TrieCacheGenFlag.Name); gen > 0 { state.MaxTrieCacheGen = uint16(gen) } - if ctx.GlobalIsSet(ConsensusDMomentFlag.Name) { - cfg.DMoment = int64(ctx.GlobalUint64(ConsensusDMomentFlag.Name)) - } else { - // TODO(jimmy): default DMoment should be set based on networkId. - now := time.Now() - cfg.DMoment = time.Date( - now.Year(), now.Month(), now.Day(), - now.Hour(), now.Minute(), (now.Second()/5+1)*5, - 0, now.Location()).Unix() - } // Set indexer config. setIndexerConfig(ctx, cfg) -- cgit