chore(types): add MustAccAddressFromBech32 util func (#12201)
This commit is contained in:
@@ -163,6 +163,16 @@ func VerifyAddressFormat(bz []byte) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// MustAccAddressFromBech32 calls AccAddressFromBech32 and panics on error.
|
||||
func MustAccAddressFromBech32(address string) AccAddress {
|
||||
addr, err := AccAddressFromBech32(address)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return addr
|
||||
}
|
||||
|
||||
// AccAddressFromBech32 creates an AccAddress from a Bech32 string.
|
||||
func AccAddressFromBech32(address string) (addr AccAddress, err error) {
|
||||
if len(strings.TrimSpace(address)) == 0 {
|
||||
|
||||
+3
-14
@@ -114,10 +114,7 @@ func (t *Tx) GetSigners() []sdk.AccAddress {
|
||||
// ensure any specified fee payer is included in the required signers (at the end)
|
||||
feePayer := t.AuthInfo.Fee.Payer
|
||||
if feePayer != "" && !seen[feePayer] {
|
||||
payerAddr, err := sdk.AccAddressFromBech32(feePayer)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
payerAddr := sdk.MustAccAddressFromBech32(feePayer)
|
||||
signers = append(signers, payerAddr)
|
||||
seen[feePayer] = true
|
||||
}
|
||||
@@ -136,11 +133,7 @@ func (t *Tx) GetFee() sdk.Coins {
|
||||
func (t *Tx) FeePayer() sdk.AccAddress {
|
||||
feePayer := t.AuthInfo.Fee.Payer
|
||||
if feePayer != "" {
|
||||
payerAddr, err := sdk.AccAddressFromBech32(feePayer)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return payerAddr
|
||||
return sdk.MustAccAddressFromBech32(feePayer)
|
||||
}
|
||||
// use first signer as default if no payer specified
|
||||
return t.GetSigners()[0]
|
||||
@@ -149,11 +142,7 @@ func (t *Tx) FeePayer() sdk.AccAddress {
|
||||
func (t *Tx) FeeGranter() sdk.AccAddress {
|
||||
feePayer := t.AuthInfo.Fee.Granter
|
||||
if feePayer != "" {
|
||||
granterAddr, err := sdk.AccAddressFromBech32(feePayer)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return granterAddr
|
||||
return sdk.MustAccAddressFromBech32(feePayer)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user