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) --- dex/backend.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'dex/backend.go') diff --git a/dex/backend.go b/dex/backend.go index 88cfa3033..c75fdfa29 100644 --- a/dex/backend.go +++ b/dex/backend.go @@ -162,8 +162,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Dexon, error) { // Set config fetcher so engine can fetch current system configuration from state. engine.SetGovStateFetcher(dex.governance) - dMoment := time.Unix(config.DMoment, int64(0)) - log.Info("DEXON Consensus DMoment", "time", dMoment) + dMoment := time.Unix(int64(chainConfig.DMoment), 0) // Force starting with full sync mode if this node is a bootstrap proposer. if config.BlockProposerEnabled && dMoment.After(time.Now()) { @@ -171,8 +170,8 @@ func New(ctx *node.ServiceContext, config *Config) (*Dexon, error) { } pm, err := NewProtocolManager(dex.chainConfig, config.SyncMode, - config.NetworkId, dex.eventMux, dex.txPool, dex.engine, dex.blockchain, - chainDb, config.BlockProposerEnabled, dex.governance, dex.app) + config.NetworkId, chainConfig.DMoment, dex.eventMux, dex.txPool, dex.engine, + dex.blockchain, chainDb, config.BlockProposerEnabled, dex.governance, dex.app) if err != nil { return nil, err } -- cgit