Skip to content

chore: fix mergify conflicts in #8483 #8549

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

Merged
gjermundgaraba merged 2 commits into from
Jun 19, 2025
Merged

chore: fix mergify conflicts in #8483 #8549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ec5033
chore: fix mergify conflicts
boojamya Jun 19, 2025
ae89005
chore: fix lint and test case
boojamya Jun 19, 2025
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
8 changes: 2 additions & 6 deletions modules/core/02-client/types/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package types

import (
<<<<<<< HEAD
proto "github.com/cosmos/gogoproto/proto"
=======
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/legacy"
"github.com/cosmos/gogoproto/proto"
>>>>>>> de2f70a4 (fix: support amino encoding on MsgRecoverClient (#8448))

errorsmod "cosmossdk.io/errors"

"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/legacy"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/msgservice"
Expand Down
167 changes: 54 additions & 113 deletions modules/core/02-client/types/tx.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions modules/core/04-channel/keeper/packet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ func (suite *KeeperTestSuite) TestAcknowledgePacket() {
path.EndpointB.Chain.App.GetIBCKeeper().ChannelKeeper.SetPacketAcknowledgement(path.EndpointB.Chain.GetContext(), path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, sequence, types.CommitAcknowledgement(ack))

path.EndpointB.Chain.NextBlock()
path.EndpointA.UpdateClient()
suite.Require().NoError(path.EndpointA.UpdateClient())
},
expResult: func(commitment []byte, err error) {
suite.Require().Error(err)
Expand All @@ -1130,7 +1130,7 @@ func (suite *KeeperTestSuite) TestAcknowledgePacket() {
path.EndpointB.Chain.App.GetIBCKeeper().ChannelKeeper.SetPacketAcknowledgement(path.EndpointB.Chain.GetContext(), path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, sequence, types.CommitAcknowledgement(ack))

path.EndpointB.Chain.NextBlock()
path.EndpointA.UpdateClient()
suite.Require().NoError(path.EndpointA.UpdateClient())
},
expResult: func(commitment []byte, err error) {
suite.Require().NoError(err)
Expand Down
Loading