Merge PR #3806: Fix nil returned in Unmarshal functions

* Fix nils returned in unmarshal functions * Address comments
cosmos · Mar 6, 2019 · 805e7fb · 805e7fb
1 parent dcc3357
commit 805e7fb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/PENDING.md b/PENDING.md
@@ -107,6 +107,7 @@ CLI flag.
 ### Gaia
 
 * [\#3777](https://github.com/cosmso/cosmos-sdk/pull/3777) `gaiad export` no longer panics when the database is empty
+* [\#3806](https://github.com/cosmos/cosmos-sdk/pull/3806) Properly return errors from a couple of struct Unmarshal functions
 
 ### SDK
 

diff --git a/types/address.go b/types/address.go
@@ -279,7 +279,7 @@ func (va *ValAddress) UnmarshalJSON(data []byte) error {
 
 	err := json.Unmarshal(data, &s)
 	if err != nil {
-		return nil
+		return err
 	}
 
 	va2, err := ValAddressFromBech32(s)
@@ -415,7 +415,7 @@ func (ca *ConsAddress) UnmarshalJSON(data []byte) error {
 
 	err := json.Unmarshal(data, &s)
 	if err != nil {
-		return nil
+		return err
 	}
 
 	ca2, err := ConsAddressFromBech32(s)

diff --git a/x/gov/depositsvotes.go b/x/gov/depositsvotes.go
@@ -135,7 +135,7 @@ func (vo *VoteOption) UnmarshalJSON(data []byte) error {
 	var s string
 	err := json.Unmarshal(data, &s)
 	if err != nil {
-		return nil
+		return err
 	}
 
 	bz2, err := VoteOptionFromString(s)

diff --git a/x/gov/proposals.go b/x/gov/proposals.go
@@ -206,7 +206,7 @@ func (pt *ProposalKind) UnmarshalJSON(data []byte) error {
 	var s string
 	err := json.Unmarshal(data, &s)
 	if err != nil {
-		return nil
+		return err
 	}
 
 	bz2, err := ProposalTypeFromString(s)
@@ -307,7 +307,7 @@ func (status *ProposalStatus) UnmarshalJSON(data []byte) error {
 	var s string
 	err := json.Unmarshal(data, &s)
 	if err != nil {
-		return nil
+		return err
 	}
 
 	bz2, err := ProposalStatusFromString(s)