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

fix validate basic check in channels #7962

Merged
merged 4 commits into from
Nov 17, 2020
Merged

fix validate basic check in channels #7962

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
453d352
fix validate basic check
colin-axner Nov 17, 2020
91f41da
Merge branch 'master' into colin/uninit-channel-check
colin-axner Nov 17, 2020
620c464
Merge branch 'master' into colin/uninit-channel-check
fedekunze Nov 17, 2020
3d7250b
Merge branch 'master' into colin/uninit-channel-check
colin-axner Nov 17, 2020
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
2 changes: 1 addition & 1 deletion x/ibc/core/04-channel/types/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (ch Channel) GetVersion() string {

// ValidateBasic performs a basic validation of the channel fields
func (ch Channel) ValidateBasic() error {
if ch.State.String() == "" {
if ch.State == UNINITIALIZED {
return ErrInvalidChannelState
}
if !(ch.Ordering == ORDERED || ch.Ordering == UNORDERED) {
Expand Down
27 changes: 27 additions & 0 deletions x/ibc/core/04-channel/types/channel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,33 @@ import (
"github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
)

func TestChannelValidateBasic(t *testing.T) {
counterparty := types.Counterparty{"portidone", "channelidone"}
testCases := []struct {
name string
channel types.Channel
expPass bool
}{
{"valid channel", types.NewChannel(types.TRYOPEN, types.ORDERED, counterparty, connHops, version), true},
{"invalid state", types.NewChannel(types.UNINITIALIZED, types.ORDERED, counterparty, connHops, version), false},
{"invalid order", types.NewChannel(types.TRYOPEN, types.NONE, counterparty, connHops, version), false},
{"more than 1 connection hop", types.NewChannel(types.TRYOPEN, types.ORDERED, counterparty, []string{"connection1", "connection2"}, version), false},
{"invalid connection hop identifier", types.NewChannel(types.TRYOPEN, types.ORDERED, counterparty, []string{"(invalid)"}, version), false},
{"invalid counterparty", types.NewChannel(types.TRYOPEN, types.ORDERED, types.NewCounterparty("(invalidport)", "channelidone"), connHops, version), false},
}

for i, tc := range testCases {
tc := tc

err := tc.channel.ValidateBasic()
if tc.expPass {
require.NoError(t, err, "valid test case %d failed: %s", i, tc.name)
} else {
require.Error(t, err, "invalid test case %d passed: %s", i, tc.name)
}
}
}

func TestCounterpartyValidateBasic(t *testing.T) {
testCases := []struct {
name string
Expand Down