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

chore: update tests to use new SendPacket API (backport #2567) #2591

Merged
merged 12 commits into from
Nov 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 25, 2022

This is an automatic backport of pull request #2567 done by Mergify.
Cherry-pick of 8ce603d has failed:

On branch mergify/bp/release/v6.0.x/pr-2567
Your branch is up to date with 'origin/release/v6.0.x'.

You are currently cherry-picking commit 8ce603d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/apps/29-fee/keeper/msg_server_test.go
	modified:   modules/core/03-connection/keeper/verify_test.go
	modified:   modules/core/04-channel/keeper/packet_test.go
	modified:   modules/core/04-channel/keeper/timeout_test.go
	modified:   modules/core/keeper/msg_server_test.go
	modified:   testing/endpoint.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   modules/core/ante/ante_test.go
	deleted by us:   modules/light-clients/07-tendermint/client_state_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* chore: update tests to use new SendPacket API

* add changelog

* remove source port and source channel from parameter list of SendPacket

Co-authored-by: Carlos Rodriguez <[email protected]>
(cherry picked from commit 8ce603d)

# Conflicts:
#	modules/core/ante/ante_test.go
#	modules/light-clients/07-tendermint/client_state_test.go
@crodriguezvega
Copy link
Contributor

Backport hell! I will fix the tests tomorrow...

@crodriguezvega crodriguezvega self-assigned this Oct 25, 2022
@crodriguezvega crodriguezvega removed their assignment Oct 30, 2022

err := suite.path.EndpointA.SendPacket(packet)
suite.Require().NoError(err)
clienttypes.NewHeight(2, 0), 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was this supposed to change?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. It was not intentional, but I copied from main. I will change it back

func (suite *AnteTestSuite) createRecvPacketMessage(sequenceNumber uint64, isRedundant bool) sdk.Msg {
packet := channeltypes.NewPacket(ibctesting.MockPacketData, sequenceNumber,
func (suite *AnteTestSuite) createRecvPacketMessage(isRedundant bool) sdk.Msg {
sequence, err := suite.path.EndpointA.SendPacket(clienttypes.NewHeight(2, 0), 0, ibctesting.MockPacketData)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

@crodriguezvega crodriguezvega merged commit 7fe0553 into release/v6.0.x Nov 2, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v6.0.x/pr-2567 branch November 2, 2022 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants