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.

Sign up for GitHub

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

Remove GetSigners from module 04-channel #5352

Merged
merged 10 commits into from
Dec 11, 2023
Merged

Remove GetSigners from module 04-channel #5352

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aa0be29
remove GetSigners from module 04-channel
ThanhNhann Dec 9, 2023
04b2638
Merge branch '04-channel-upgrades' into nhan/remove_GetSigners_04_cha…
ThanhNhann Dec 9, 2023
cc165b5
linting
Dec 10, 2023
777c5a3
fix conflict
ThanhNhann Dec 10, 2023
a929e05
add tests GetSigners for remain msgs
ThanhNhann Dec 11, 2023
c922753
Merge branch '04-channel-upgrades' into nhan/remove_GetSigners_04_cha…
damiannolan Dec 11, 2023
98f2800
Merge branch '04-channel-upgrades' into nhan/remove_GetSigners_04_cha…
ThanhNhann Dec 11, 2023
117a4d7
add tests GetSigners for MsgTimeout
ThanhNhann Dec 11, 2023
709948e
Merge branch 'nhan/remove_GetSigners_04_channel' of https://github.co…
ThanhNhann Dec 11, 2023
e86d1ed
update with Colin's review
ThanhNhann Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions e2e/tests/wasm/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ import (
"testing"
"time"

testifysuite "github.com/stretchr/testify/suite"

"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
"github.com/strangelove-ventures/interchaintest/v8/testutil"
testifysuite "github.com/stretchr/testify/suite"

upgradetypes "cosmossdk.io/x/upgrade/types"

authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"

"github.com/cosmos/ibc-go/e2e/testsuite"
"github.com/cosmos/ibc-go/e2e/testvalues"
wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
Expand Down
87 changes: 0 additions & 87 deletions modules/core/04-channel/types/msgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,15 +380,6 @@ func (msg MsgAcknowledgement) ValidateBasic() error {
return msg.Packet.ValidateBasic()
}

// GetSigners implements sdk.Msg
func (msg MsgAcknowledgement) GetSigners() []sdk.AccAddress {
signer, err := sdk.AccAddressFromBech32(msg.Signer)
if err != nil {
panic(err)
}
return []sdk.AccAddress{signer}
}

var _ sdk.Msg = &MsgChannelUpgradeInit{}

// NewMsgChannelUpgradeInit constructs a new MsgChannelUpgradeInit
Expand Down Expand Up @@ -423,16 +414,6 @@ func (msg MsgChannelUpgradeInit) ValidateBasic() error {
return msg.Fields.ValidateBasic()
}

// GetSigners implements sdk.Msg
func (msg MsgChannelUpgradeInit) GetSigners() []sdk.AccAddress {
signer, err := sdk.AccAddressFromBech32(msg.Signer)
if err != nil {
panic(err)
}

return []sdk.AccAddress{signer}
}

var _ sdk.Msg = &MsgChannelUpgradeTry{}

// NewMsgChannelUpgradeTry constructs a new MsgChannelUpgradeTry
Expand Down Expand Up @@ -499,16 +480,6 @@ func (msg MsgChannelUpgradeTry) ValidateBasic() error {
return nil
}

// GetSigners implements sdk.Msg
func (msg MsgChannelUpgradeTry) GetSigners() []sdk.AccAddress {
signer, err := sdk.AccAddressFromBech32(msg.Signer)
if err != nil {
panic(err)
}

return []sdk.AccAddress{signer}
}

var _ sdk.Msg = &MsgChannelUpgradeAck{}

// NewMsgChannelUpgradeAck constructs a new MsgChannelUpgradeAck
Expand Down Expand Up @@ -546,16 +517,6 @@ func (msg MsgChannelUpgradeAck) ValidateBasic() error {
return msg.CounterpartyUpgrade.ValidateBasic()
}

// GetSigners implements sdk.Msg
func (msg MsgChannelUpgradeAck) GetSigners() []sdk.AccAddress {
signer, err := sdk.AccAddressFromBech32(msg.Signer)
if err != nil {
panic(err)
}

return []sdk.AccAddress{signer}
}

var _ sdk.Msg = &MsgChannelUpgradeConfirm{}

// NewMsgChannelUpgradeConfirm constructs a new MsgChannelUpgradeConfirm
Expand Down Expand Up @@ -611,16 +572,6 @@ func (msg MsgChannelUpgradeConfirm) ValidateBasic() error {
return msg.CounterpartyUpgrade.ValidateBasic()
}

// GetSigners implements sdk.Msg
func (msg MsgChannelUpgradeConfirm) GetSigners() []sdk.AccAddress {
signer, err := sdk.AccAddressFromBech32(msg.Signer)
if err != nil {
panic(err)
}

return []sdk.AccAddress{signer}
}

var _ sdk.Msg = &MsgChannelUpgradeOpen{}

// NewMsgChannelUpgradeOpen constructs a new MsgChannelUpgradeOpen
Expand Down Expand Up @@ -669,15 +620,6 @@ func (msg MsgChannelUpgradeOpen) ValidateBasic() error {
return nil
}

// GetSigners implements sdk.Msg
func (msg MsgChannelUpgradeOpen) GetSigners() []sdk.AccAddress {
signer, err := sdk.AccAddressFromBech32(msg.Signer)
if err != nil {
panic(err)
}
return []sdk.AccAddress{signer}
}

var _ sdk.Msg = &MsgChannelUpgradeTimeout{}

// NewMsgChannelUpgradeTimeout constructs a new MsgChannelUpgradeTimeout
Expand Down Expand Up @@ -725,16 +667,6 @@ func (msg MsgChannelUpgradeTimeout) ValidateBasic() error {
return nil
}

// GetSigners implements sdk.Msg
func (msg MsgChannelUpgradeTimeout) GetSigners() []sdk.AccAddress {
signer, err := sdk.AccAddressFromBech32(msg.Signer)
if err != nil {
panic(err)
}

return []sdk.AccAddress{signer}
}

var _ sdk.Msg = &MsgChannelUpgradeCancel{}

// NewMsgChannelUpgradeCancel constructs a new MsgChannelUpgradeCancel
Expand Down Expand Up @@ -774,16 +706,6 @@ func (msg MsgChannelUpgradeCancel) ValidateBasic() error {
return nil
}

// GetSigners implements sdk.Msg
func (msg MsgChannelUpgradeCancel) GetSigners() []sdk.AccAddress {
signer, err := sdk.AccAddressFromBech32(msg.Signer)
if err != nil {
panic(err)
}

return []sdk.AccAddress{signer}
}

// NewMsgUpdateChannelParams creates a new instance of MsgUpdateParams.
func NewMsgUpdateChannelParams(authority string, params Params) *MsgUpdateParams {
return &MsgUpdateParams{
Expand All @@ -792,15 +714,6 @@ func NewMsgUpdateChannelParams(authority string, params Params) *MsgUpdateParams
}
}

// GetSigners returns the expected signers for a MsgUpdateParams message.
func (msg *MsgUpdateParams) GetSigners() []sdk.AccAddress {
accAddr, err := sdk.AccAddressFromBech32(msg.Authority)
if err != nil {
panic(err)
}
return []sdk.AccAddress{accAddr}
}

// ValidateBasic performs basic checks on a MsgUpdateParams.
func (msg *MsgUpdateParams) ValidateBasic() error {
if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil {
Expand Down
Loading
Loading