fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 06:42:16 +00:00
Code Issues Projects Releases Wiki Activity

ConsensusParams ptr in GenesisDoc for json

Browse Source
This commit is contained in:
Ethan Buchman 2017-09-21 15:22:58 -04:00
parent 3089bbf2b8
commit 1f0985689d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
state/state.go
View File

@ -266,7 +266,7 @@ func (s *State) GetValidators() (*types.ValidatorSet, *types.ValidatorSet) {
func (s *State) Params() types.ConsensusParams { func (s *State) Params() types.ConsensusParams {
// TODO: this should move into the State proper // TODO: this should move into the State proper
// when we allow the app to change it // when we allow the app to change it
return s.GenesisDoc.ConsensusParams return *s.GenesisDoc.ConsensusParams
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------

5
types/genesis.go
View File

@ -26,7 +26,7 @@ type GenesisValidator struct {
type GenesisDoc struct { type GenesisDoc struct {
GenesisTime time.Time `json:"genesis_time"` GenesisTime time.Time `json:"genesis_time"`
ChainID string `json:"chain_id"` ChainID string `json:"chain_id"`
ConsensusParams ConsensusParams `json:"consensus_params"` ConsensusParams *ConsensusParams `json:"consensus_params,omitempty"`
Validators []GenesisValidator `json:"validators"` Validators []GenesisValidator `json:"validators"`
AppHash data.Bytes `json:"app_hash"` AppHash data.Bytes `json:"app_hash"`
} }
@ -58,8 +58,7 @@ func (genDoc *GenesisDoc) ValidateAndComplete() error {
return errors.Errorf("Genesis doc must include non-empty chain_id") return errors.Errorf("Genesis doc must include non-empty chain_id")
} }
var emptyParams ConsensusParams if genDoc.ConsensusParams == nil {
if genDoc.ConsensusParams == emptyParams {
genDoc.ConsensusParams = DefaultConsensusParams() genDoc.ConsensusParams = DefaultConsensusParams()
} else { } else {
if err := genDoc.ConsensusParams.Validate(); err != nil { if err := genDoc.ConsensusParams.Validate(); err != nil {

4
types/params.go
View File

@ -35,8 +35,8 @@ type BlockGossipParams struct {
} }
// DefaultConsensusParams returns a default ConsensusParams. // DefaultConsensusParams returns a default ConsensusParams.
func DefaultConsensusParams() ConsensusParams { func DefaultConsensusParams() *ConsensusParams {
return ConsensusParams{ return &ConsensusParams{
DefaultBlockSizeParams(), DefaultBlockSizeParams(),
DefaultTxSizeParams(), DefaultTxSizeParams(),
DefaultBlockGossipParams(), DefaultBlockGossipParams(),