diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-11-02 12:43:39 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:52 +0800 |
| commit | 9448a5812ad889399ee7b628cc9199752b81da93 (patch) | |
| tree | 005b30d9d3943dee1bf3745e06c08f03eb009b0c /params | |
| parent | 745d76dc5e0f913059e7f89d24f3837b51f8d812 (diff) | |
| download | dexon-9448a5812ad889399ee7b628cc9199752b81da93.tar dexon-9448a5812ad889399ee7b628cc9199752b81da93.tar.gz dexon-9448a5812ad889399ee7b628cc9199752b81da93.tar.bz2 dexon-9448a5812ad889399ee7b628cc9199752b81da93.tar.lz dexon-9448a5812ad889399ee7b628cc9199752b81da93.tar.xz dexon-9448a5812ad889399ee7b628cc9199752b81da93.tar.zst dexon-9448a5812ad889399ee7b628cc9199752b81da93.zip | |
core: vm: governance: remove maxInterval
Diffstat (limited to 'params')
| -rw-r--r-- | params/config.go | 6 | ||||
| -rw-r--r-- | params/gen_dexcon_config.go | 6 |
2 files changed, 1 insertions, 11 deletions
diff --git a/params/config.go b/params/config.go index 9cb80dd24..b247b62d3 100644 --- a/params/config.go +++ b/params/config.go @@ -58,7 +58,6 @@ var ( DKGSetSize: 4, RoundInterval: 99999999999, MinBlockInterval: 900, - MaxBlockInterval: 1100, }, } @@ -97,7 +96,6 @@ var ( DKGSetSize: 4, RoundInterval: 99999999999, MinBlockInterval: 900, - MaxBlockInterval: 1100, }, } @@ -207,7 +205,6 @@ type DexconConfig struct { DKGSetSize uint32 `json:"dkgSetSize"` RoundInterval uint64 `json:"roundInterval"` MinBlockInterval uint64 `json:"minBlockInterval"` - MaxBlockInterval uint64 `json:"maxBlockInterval"` } type dexconConfigSpecMarshaling struct { @@ -216,7 +213,7 @@ type dexconConfigSpecMarshaling struct { // String implements the stringer interface, returning the consensus engine details. func (d *DexconConfig) String() string { - return fmt.Sprintf("{GenesisCRSText: %v Owner: %v BlockReward: %v BlockGasLimit: %v NumChains: %v LambdaBA: %v LambdaDKG: %v K: %v PhiRatio: %v NotarySetSize: %v DKGSetSize: %v RoundInterval: %v MinBlockInterval: %v MaxBlockInterval: %v BlockReward: %v", + return fmt.Sprintf("{GenesisCRSText: %v Owner: %v BlockReward: %v BlockGasLimit: %v NumChains: %v LambdaBA: %v LambdaDKG: %v K: %v PhiRatio: %v NotarySetSize: %v DKGSetSize: %v RoundInterval: %v MinBlockInterval: %v", d.GenesisCRSText, d.Owner, d.BlockReward, @@ -230,7 +227,6 @@ func (d *DexconConfig) String() string { d.DKGSetSize, d.RoundInterval, d.MinBlockInterval, - d.MaxBlockInterval, ) } diff --git a/params/gen_dexcon_config.go b/params/gen_dexcon_config.go index f378b4588..e1be574c0 100644 --- a/params/gen_dexcon_config.go +++ b/params/gen_dexcon_config.go @@ -28,7 +28,6 @@ func (d DexconConfig) MarshalJSON() ([]byte, error) { DKGSetSize uint32 `json:"dkgSetSize"` RoundInterval uint64 `json:"roundInterval"` MinBlockInterval uint64 `json:"minBlockInterval"` - MaxBlockInterval uint64 `json:"maxBlockInterval"` } var enc DexconConfig enc.GenesisCRSText = d.GenesisCRSText @@ -44,7 +43,6 @@ func (d DexconConfig) MarshalJSON() ([]byte, error) { enc.DKGSetSize = d.DKGSetSize enc.RoundInterval = d.RoundInterval enc.MinBlockInterval = d.MinBlockInterval - enc.MaxBlockInterval = d.MaxBlockInterval return json.Marshal(&enc) } @@ -64,7 +62,6 @@ func (d *DexconConfig) UnmarshalJSON(input []byte) error { DKGSetSize *uint32 `json:"dkgSetSize"` RoundInterval *uint64 `json:"roundInterval"` MinBlockInterval *uint64 `json:"minBlockInterval"` - MaxBlockInterval *uint64 `json:"maxBlockInterval"` } var dec DexconConfig if err := json.Unmarshal(input, &dec); err != nil { @@ -109,8 +106,5 @@ func (d *DexconConfig) UnmarshalJSON(input []byte) error { if dec.MinBlockInterval != nil { d.MinBlockInterval = *dec.MinBlockInterval } - if dec.MaxBlockInterval != nil { - d.MaxBlockInterval = *dec.MaxBlockInterval - } return nil } |