make MaxAge nonnullable

types/params.go

@@ -111,9 +111,7 @@ func (params ConsensusParams) Update(params2 *abci.ConsensusParams) ConsensusPar
 		res.BlockSize.MaxGas = params2.BlockSize.MaxGas
 	}
 	if params2.EvidenceParams != nil {
-		if params2.EvidenceParams.MaxAge != nil {
-			res.EvidenceParams.MaxAge = *params2.EvidenceParams.MaxAge
-		}
+		res.EvidenceParams.MaxAge = params2.EvidenceParams.MaxAge
 	}
 	return res
 }

types/params_test.go

@@ -72,7 +72,6 @@ func TestConsensusParamsHash(t *testing.T) {
 }
 
 func TestConsensusParamsUpdate(t *testing.T) {
-	newMaxAge := 300 * time.Second
 	testCases := []struct {
 		params        ConsensusParams
 		updates       *abci.ConsensusParams
@@ -93,7 +92,7 @@ func TestConsensusParamsUpdate(t *testing.T) {
 					MaxGas:   200,
 				},
 				EvidenceParams: &abci.EvidenceParams{
-					MaxAge: &newMaxAge,
+					MaxAge: 300 * time.Second,
 				},
 			},
 			makeParams(100, 200, 300*time.Second),

types/protobuf.go

@@ -119,7 +119,7 @@ func (tm2pb) ConsensusParams(params *ConsensusParams) *abci.ConsensusParams {
 			MaxGas:   params.BlockSize.MaxGas,
 		},
 		EvidenceParams: &abci.EvidenceParams{
-			MaxAge: &params.EvidenceParams.MaxAge,
+			MaxAge: params.EvidenceParams.MaxAge,
 		},
 	}
 }
@@ -209,14 +209,18 @@ func (pb2tm) ValidatorUpdates(vals []abci.ValidatorUpdate) ([]*Validator, error)
 }
 
 func (pb2tm) ConsensusParams(csp *abci.ConsensusParams) ConsensusParams {
-	params := ConsensusParams{
-		BlockSize: BlockSize{
+	params := ConsensusParams{}
+
+	// we must defensively consider any structs may be nil
+	if csp.BlockSize != nil {
+		params.BlockSize = BlockSize{
 			MaxBytes: csp.BlockSize.MaxBytes,
 			MaxGas:   csp.BlockSize.MaxGas,
-		},
+		}
 	}
-	if csp.EvidenceParams.MaxAge != nil {
-		params.EvidenceParams.MaxAge = *csp.EvidenceParams.MaxAge
+	if csp.EvidenceParams != nil {
+		params.EvidenceParams.MaxAge = csp.EvidenceParams.MaxAge
 	}
+
 	return params
 }