Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: change AccAddressFromBech32 to MustAccAddressFromBech32 #691

Merged
merged 9 commits into from
Oct 11, 2022
22 changes: 11 additions & 11 deletions x/foundation/msgs.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func (m MsgFundTreasury) ValidateBasic() error {

// GetSigners implements Msg.
func (m MsgFundTreasury) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.From)
signer := sdk.MustAccAddressFromBech32(m.From)
return []sdk.AccAddress{signer}
}

Expand All @@ -50,7 +50,7 @@ func (m MsgWithdrawFromTreasury) ValidateBasic() error {

// GetSigners implements Msg.
func (m MsgWithdrawFromTreasury) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.Operator)
signer := sdk.MustAccAddressFromBech32(m.Operator)
return []sdk.AccAddress{signer}
}

Expand All @@ -74,7 +74,7 @@ func (m MsgUpdateMembers) ValidateBasic() error {

// GetSigners implements Msg.
func (m MsgUpdateMembers) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.Operator)
signer := sdk.MustAccAddressFromBech32(m.Operator)
return []sdk.AccAddress{signer}
}

Expand All @@ -99,7 +99,7 @@ func (m MsgUpdateDecisionPolicy) ValidateBasic() error {

// GetSigners implements Msg.
func (m MsgUpdateDecisionPolicy) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.Operator)
signer := sdk.MustAccAddressFromBech32(m.Operator)
return []sdk.AccAddress{signer}
}

Expand Down Expand Up @@ -179,7 +179,7 @@ func (m MsgSubmitProposal) UnpackInterfaces(unpacker codectypes.AnyUnpacker) err
func (m MsgSubmitProposal) GetSigners() []sdk.AccAddress {
signers := make([]sdk.AccAddress, len(m.Proposers))
for i, p := range m.Proposers {
proposer, _ := sdk.AccAddressFromBech32(p)
proposer := sdk.MustAccAddressFromBech32(p)
signers[i] = proposer
}
return signers
Expand All @@ -202,7 +202,7 @@ func (m MsgWithdrawProposal) ValidateBasic() error {

// GetSigners implements Msg.
func (m MsgWithdrawProposal) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.Address)
signer := sdk.MustAccAddressFromBech32(m.Address)
return []sdk.AccAddress{signer}
}

Expand Down Expand Up @@ -231,7 +231,7 @@ func (m MsgVote) ValidateBasic() error {

// GetSigners implements Msg.
func (m MsgVote) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.Voter)
signer := sdk.MustAccAddressFromBech32(m.Voter)
return []sdk.AccAddress{signer}
}

Expand All @@ -252,7 +252,7 @@ func (m MsgExec) ValidateBasic() error {

// GetSigners implements Msg.
func (m MsgExec) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.Signer)
signer := sdk.MustAccAddressFromBech32(m.Signer)
return []sdk.AccAddress{signer}
}

Expand All @@ -269,7 +269,7 @@ func (m MsgLeaveFoundation) ValidateBasic() error {

// GetSigners implements Msg.
func (m MsgLeaveFoundation) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.Address)
signer := sdk.MustAccAddressFromBech32(m.Address)
return []sdk.AccAddress{signer}
}

Expand Down Expand Up @@ -325,7 +325,7 @@ func (m MsgGrant) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error {

// GetSigners implements Msg.
func (m MsgGrant) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.Operator)
signer := sdk.MustAccAddressFromBech32(m.Operator)
return []sdk.AccAddress{signer}
}

Expand All @@ -350,6 +350,6 @@ func (m MsgRevoke) ValidateBasic() error {

// GetSigners implements Msg.
func (m MsgRevoke) GetSigners() []sdk.AccAddress {
signer, _ := sdk.AccAddressFromBech32(m.Operator)
signer := sdk.MustAccAddressFromBech32(m.Operator)
return []sdk.AccAddress{signer}
}
112 changes: 112 additions & 0 deletions x/foundation/msgs_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package foundation_test

import (
"encoding/hex"
"fmt"
"testing"
"time"

Expand All @@ -11,6 +13,50 @@ import (
"github.com/line/lbm-sdk/x/foundation"
)

func NewMsgFundTreasury(fromAddr sdk.AccAddress) *foundation.MsgFundTreasury {
return &foundation.MsgFundTreasury{From: fromAddr.String()}
}
0Tech marked this conversation as resolved.
Show resolved Hide resolved

func NewMsgWithdrawFromTreasury(fromAddr sdk.AccAddress) *foundation.MsgWithdrawFromTreasury {
return &foundation.MsgWithdrawFromTreasury{Operator: fromAddr.String()}
}

func NewMsgUpdateMembers(fromAddr sdk.AccAddress) *foundation.MsgUpdateMembers {
return &foundation.MsgUpdateMembers{Operator: fromAddr.String()}
}

func NewMsgUpdateDecisionPolicy(fromAddr sdk.AccAddress) *foundation.MsgUpdateDecisionPolicy {
return &foundation.MsgUpdateDecisionPolicy{Operator: fromAddr.String()}
}

func NewMsgSubmitProposal(fromAddr sdk.AccAddress) *foundation.MsgSubmitProposal {
return &foundation.MsgSubmitProposal{Proposers: []string{fromAddr.String()}}
}

func NewMsgWithdrawProposal(fromAddr sdk.AccAddress) *foundation.MsgWithdrawProposal {
return &foundation.MsgWithdrawProposal{Address: fromAddr.String()}
}

func NewMsgVote(fromAddr sdk.AccAddress) *foundation.MsgVote {
return &foundation.MsgVote{Voter: fromAddr.String()}
}

func NewMsgExec(fromAddr sdk.AccAddress) *foundation.MsgExec {
return &foundation.MsgExec{Signer: fromAddr.String()}
}

func NewMsgLeaveFoundation(fromAddr sdk.AccAddress) *foundation.MsgLeaveFoundation {
return &foundation.MsgLeaveFoundation{Address: fromAddr.String()}
}

func NewMsgGrant(fromAddr sdk.AccAddress) *foundation.MsgGrant {
return &foundation.MsgGrant{Operator: fromAddr.String()}
}

func NewMsgRevoke(fromAddr sdk.AccAddress) *foundation.MsgRevoke {
return &foundation.MsgRevoke{Operator: fromAddr.String()}
}

func TestMsgFundTreasury(t *testing.T) {
addrs := make([]sdk.AccAddress, 1)
for i := range addrs {
Expand Down Expand Up @@ -623,3 +669,69 @@ func TestMsgRevoke(t *testing.T) {
require.Equal(t, []sdk.AccAddress{tc.operator}, msg.GetSigners(), name)
}
}

func TestMsgFundTreasuryGetSigners(t *testing.T) {
res := NewMsgFundTreasury(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgWithdrawFromTreasuryGetSigners(t *testing.T) {
res := NewMsgFundTreasury(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgUpdateMembersGetSigners(t *testing.T) {
res := NewMsgUpdateMembers(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgUpdateDecisionPolicyGetSigners(t *testing.T) {
res := NewMsgUpdateDecisionPolicy(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgSubmitProposalGetSigners(t *testing.T) {
res := NewMsgSubmitProposal(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgWithdrawProposalGetSigners(t *testing.T) {
res := NewMsgWithdrawProposal(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgVoteGetSigners(t *testing.T) {
res := NewMsgVote(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgExecGetSigners(t *testing.T) {
res := NewMsgExec(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgLeaveFoundationGetSigners(t *testing.T) {
res := NewMsgLeaveFoundation(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgGrantGetSigners(t *testing.T) {
res := NewMsgGrant(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}

func TestMsgRevokeGetSigners(t *testing.T) {
res := NewMsgRevoke(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}
2 changes: 1 addition & 1 deletion x/wasm/lbmtypes/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ func (msg MsgStoreCodeAndInstantiateContract) GetSignBytes() []byte {
}

func (msg MsgStoreCodeAndInstantiateContract) GetSigners() []sdk.AccAddress {
senderAddr, _ := sdk.AccAddressFromBech32(msg.Sender)
senderAddr := sdk.MustAccAddressFromBech32(msg.Sender)
return []sdk.AccAddress{senderAddr}
}
12 changes: 12 additions & 0 deletions x/wasm/lbmtypes/tx_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package lbmtypes

import (
"encoding/hex"
"fmt"
"testing"

"github.com/stretchr/testify/assert"
Expand All @@ -10,6 +12,10 @@ import (
wasmTypes "github.com/line/lbm-sdk/x/wasm/types"
)

func NewMsgStoreCodeAndInstantiateContract(fromAddr sdk.AccAddress) *MsgStoreCodeAndInstantiateContract {
return &MsgStoreCodeAndInstantiateContract{Sender: fromAddr.String()}
}

func TestStoreCodeAndInstantiateContractValidation(t *testing.T) {
bad, err := sdk.AccAddressFromHex("012345")
require.NoError(t, err)
Expand Down Expand Up @@ -122,3 +128,9 @@ func TestStoreCodeAndInstantiateContractValidation(t *testing.T) {
})
}
}

func TestNewMsgStoreCodeAndInstantiateContractGetSigners(t *testing.T) {
res := NewMsgStoreCodeAndInstantiateContract(sdk.AccAddress([]byte("input111111111111111"))).GetSigners()
bytes := sdk.MustAccAddressFromBech32(res[0].String())
require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes)))
}