Merge PR #3806: Fix nil returned in Unmarshal functions

* Fix nils returned in unmarshal functions * Address comments
2019-03-06 12:38:18 +01:00
parent dcc3357ea3
commit 805e7fbfc2
4 changed files with 6 additions and 5 deletions
@@ -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)