Merge PR #3797: Have MsgCreateValidator.UnmarshalJSON return an error…

… rather than panic.
cosmos · Mar 4, 2019 · c7f6a3e · c7f6a3e
1 parent 05529f9
commit c7f6a3e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/x/staking/types/msg.go b/x/staking/types/msg.go
@@ -107,7 +107,11 @@ func (msg *MsgCreateValidator) UnmarshalJSON(bz []byte) error {
 	msg.Commission = msgCreateValJSON.Commission
 	msg.DelegatorAddress = msgCreateValJSON.DelegatorAddress
 	msg.ValidatorAddress = msgCreateValJSON.ValidatorAddress
-	msg.PubKey = sdk.MustGetConsPubKeyBech32(msgCreateValJSON.PubKey)
+	var err error
+	msg.PubKey, err = sdk.GetConsPubKeyBech32(msgCreateValJSON.PubKey)
+	if err != nil {
+		return err
+	}
 	msg.Value = msgCreateValJSON.Value
 	msg.MinSelfDelegation = msgCreateValJSON.MinSelfDelegation