From: Paladz <yzhu101@uottawa.ca>
Date: Thu, 18 Jul 2019 11:18:45 +0000 (+0800)
Subject: edit the config (#320)
X-Git-Tag: v1.0.5~107
X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=3eb2ec67d268c0e1abf3d5346aee60e9c728ab6e

edit the config (#320)
---

diff --git a/consensus/general.go b/consensus/general.go
index 8ad509fc..32620ac1 100644
--- a/consensus/general.go
+++ b/consensus/general.go
@@ -99,21 +99,6 @@ type Params struct {
 	ProducerSubsidys []ProducerSubsidy
 }
 
-// VaporDPOSConfig return the dpos consensus config
-func VaporDPOSConfig() DPOSConfig {
-	dpos := DPOSConfig{
-		NumOfConsensusNode:      10,
-		BlockNumEachNode:        12,
-		MinConsensusNodeVoteNum: uint64(100000000000000),
-		MinVoteOutputAmount:     uint64(10000000000),
-		BlockTimeInterval:       500,
-	}
-
-	dpos.RoundVoteBlockNums = uint64(uint64(dpos.NumOfConsensusNode) * dpos.BlockNumEachNode * 10)
-	dpos.MaxTimeOffsetMs = uint64(uint64(dpos.BlockTimeInterval) * dpos.BlockNumEachNode / 3)
-	return dpos
-}
-
 // ActiveNetParams is the active NetParams
 var ActiveNetParams = MainNetParams
 
@@ -140,7 +125,15 @@ var MainNetParams = Params{
 		CoinbasePendingBlockNumber: uint64(7200),
 		CoinbaseArbitrarySizeLimit: 128,
 	},
-	DPOSConfig:  VaporDPOSConfig(),
+	DPOSConfig: DPOSConfig{
+		NumOfConsensusNode:      10,
+		BlockNumEachNode:        12,
+		MinConsensusNodeVoteNum: uint64(100000000000000),
+		MinVoteOutputAmount:     uint64(100000000),
+		BlockTimeInterval:       500,
+		RoundVoteBlockNums:      1200,
+		MaxTimeOffsetMs:         2000,
+	},
 	Checkpoints: []Checkpoint{},
 	ProducerSubsidys: []ProducerSubsidy{
 		{BeginBlock: 1, EndBlock: 63072000, Subsidy: 9512938},