ConsensusParams ptr in GenesisDoc for json

state/state.go

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

types/genesis.go

@@ -26,7 +26,7 @@ type GenesisValidator struct {
 type GenesisDoc struct {
 	GenesisTime     time.Time          `json:"genesis_time"`
 	ChainID         string             `json:"chain_id"`
-	ConsensusParams ConsensusParams    `json:"consensus_params"`
+	ConsensusParams *ConsensusParams   `json:"consensus_params,omitempty"`
 	Validators      []GenesisValidator `json:"validators"`
 	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")
 	}
 
-	var emptyParams ConsensusParams
-	if genDoc.ConsensusParams == emptyParams {
+	if genDoc.ConsensusParams == nil {
 		genDoc.ConsensusParams = DefaultConsensusParams()
 	} else {
 		if err := genDoc.ConsensusParams.Validate(); err != nil {

types/params.go

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