diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-11-02 12:43:39 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:17 +0800 |
| commit | b2e87ed696aed980902308e9210fa33bf9143657 (patch) | |
| tree | 1d757233e4cfe74df87e031cef55f8808ee662ec /params | |
| parent | fa4a62c777f38a5f03176405a53c3926fcb90a31 (diff) | |
| download | go-tangerine-b2e87ed696aed980902308e9210fa33bf9143657.tar go-tangerine-b2e87ed696aed980902308e9210fa33bf9143657.tar.gz go-tangerine-b2e87ed696aed980902308e9210fa33bf9143657.tar.bz2 go-tangerine-b2e87ed696aed980902308e9210fa33bf9143657.tar.lz go-tangerine-b2e87ed696aed980902308e9210fa33bf9143657.tar.xz go-tangerine-b2e87ed696aed980902308e9210fa33bf9143657.tar.zst go-tangerine-b2e87ed696aed980902308e9210fa33bf9143657.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 11d25f9ef..744be496b 100644 --- a/params/config.go +++ b/params/config.go @@ -65,7 +65,6 @@ var ( DKGSetSize: 4, RoundInterval: 99999999999, MinBlockInterval: 900, - MaxBlockInterval: 1100, }, } @@ -104,7 +103,6 @@ var ( DKGSetSize: 4, RoundInterval: 99999999999, MinBlockInterval: 900, - MaxBlockInterval: 1100, }, } @@ -214,7 +212,6 @@ type DexconConfig struct { DKGSetSize uint32 `json:"dkgSetSize"` RoundInterval uint64 `json:"roundInterval"` MinBlockInterval uint64 `json:"minBlockInterval"` - MaxBlockInterval uint64 `json:"maxBlockInterval"` } type dexconConfigSpecMarshaling struct { @@ -223,7 +220,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, @@ -237,7 +234,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 } |