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

feat(ica): allow unordered ica channels (backport #5633) #5647

Merged
merged 8 commits into from
Jan 19, 2024
Merged

feat(ica): allow unordered ica channels (backport #5633) #5647

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
709cf8a
feat(ica): allow unordered ica channels (#5633)
srdtrk Jan 17, 2024
6e29344
chore: rm docs, e2e folders.
DimitrisJim Jan 17, 2024
f40c58f
chore: Fix conflicts.
DimitrisJim Jan 17, 2024
9bb3c46
fix: Remove API breaks on backport.
DimitrisJim Jan 17, 2024
a41d3ef
Update msgs.go
crodriguezvega Jan 18, 2024
537df77
add changelog
crodriguezvega Jan 18, 2024
157f13c
Merge branch 'release/v8.1.x' into mergify/bp/release/v8.1.x/pr-5633
DimitrisJim Jan 18, 2024
288d6e9
Merge branch 'release/v8.1.x' into mergify/bp/release/v8.1.x/pr-5633
DimitrisJim Jan 19, 2024
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
Prev Previous commit
Next Next commit
chore: Fix conflicts. 
Conflicts in controller's msgs_tests.go due to 8.1 using old approach for getting Signers.
  • Loading branch information
@DimitrisJim
DimitrisJim committed Jan 17, 2024
commit f40c58f67602708bc5e4b85e0da4f2b766fa7882
10 changes: 1 addition & 9 deletions modules/apps/27-interchain-accounts/controller/types/msgs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,8 @@ func TestMsgRegisterInterchainAccountGetSigners(t *testing.T) {
expSigner, err := sdk.AccAddressFromBech32(ibctesting.TestAccAddress)
require.NoError(t, err)

<<<<<<< HEAD
msg := types.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, ibctesting.TestAccAddress, "")
require.Equal(t, []sdk.AccAddress{expSigner}, msg.GetSigners())
=======
msg := types.NewMsgRegisterInterchainAccount(ibctesting.FirstConnectionID, ibctesting.TestAccAddress, "", channeltypes.ORDERED)
encodingCfg := moduletestutil.MakeTestEncodingConfig(ica.AppModuleBasic{})
signers, _, err := encodingCfg.Codec.GetMsgV1Signers(msg)
require.NoError(t, err)
require.Equal(t, expSigner.Bytes(), signers[0])
>>>>>>> 61748221 (feat(ica): allow unordered ica channels (#5633))
require.Equal(t, []sdk.AccAddress{expSigner}, msg.GetSigners())
}

func TestMsgSendTxValidateBasic(t *testing.T) {
Expand Down
Loading