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

refactor: remove crossing hellos from 03-connection (backport #1672) #1691

Merged
merged 5 commits into from
Jul 13, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 12, 2022

This is an automatic backport of pull request #1672 done by Mergify.
Cherry-pick of 9aab42d has failed:

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

You are currently cherry-picking commit 9aab42d.
  (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:   docs/ibc/proto-docs.md
	modified:   modules/core/03-connection/keeper/handshake.go
	modified:   modules/core/03-connection/keeper/handshake_test.go
	modified:   modules/core/03-connection/types/tx.pb.go
	modified:   modules/core/03-connection/types/version.go
	modified:   modules/core/03-connection/types/version_test.go
	modified:   modules/core/keeper/msg_server.go
	modified:   proto/ibc/core/connection/v1/tx.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   docs/migrations/v3-to-v4.md
	both modified:   testing/coordinator.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

* remove crossing hello check from ConnOpenTry and ConnOpenAck

* remove unnecessary test cases and fix build

* fix tests and add migration docs

* fix connection version check in conn open ack

* add changelog entry

* Update modules/core/03-connection/keeper/handshake.go

Co-authored-by: Aditya <[email protected]>

* remove unnecessary testing function

* improve migration documentation as per review suggestion

Co-authored-by: Aditya <[email protected]>
(cherry picked from commit 9aab42d)

# Conflicts:
#	CHANGELOG.md
#	docs/migrations/v3-to-v4.md
#	testing/coordinator.go
@colin-axner colin-axner enabled auto-merge (squash) July 13, 2022 14:53
@colin-axner colin-axner merged commit e33e9f6 into release/v4.0.x Jul 13, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v4.0.x/pr-1672 branch July 13, 2022 15:03
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 27, 2023
…1672) (cosmos#1691)

* refactor: remove crossing hellos from 03-connection (cosmos#1672)

* remove crossing hello check from ConnOpenTry and ConnOpenAck

* remove unnecessary test cases and fix build

* fix tests and add migration docs

* fix connection version check in conn open ack

* add changelog entry

* Update modules/core/03-connection/keeper/handshake.go

Co-authored-by: Aditya <[email protected]>

* remove unnecessary testing function

* improve migration documentation as per review suggestion

Co-authored-by: Aditya <[email protected]>
(cherry picked from commit 9aab42d)

* fix merge conflicts

* remove missed merge conflicts

* Update docs/migrations/v3-to-v4.md

Co-authored-by: colin axnér <[email protected]>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…1672) (cosmos#1691)

* refactor: remove crossing hellos from 03-connection (cosmos#1672)

* remove crossing hello check from ConnOpenTry and ConnOpenAck

* remove unnecessary test cases and fix build

* fix tests and add migration docs

* fix connection version check in conn open ack

* add changelog entry

* Update modules/core/03-connection/keeper/handshake.go

Co-authored-by: Aditya <[email protected]>

* remove unnecessary testing function

* improve migration documentation as per review suggestion

Co-authored-by: Aditya <[email protected]>
(cherry picked from commit 9aab42d)

* fix merge conflicts

* remove missed merge conflicts

* Update docs/migrations/v3-to-v4.md

Co-authored-by: colin axnér <[email protected]>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…1672) (cosmos#1691)

* refactor: remove crossing hellos from 03-connection (cosmos#1672)

* remove crossing hello check from ConnOpenTry and ConnOpenAck

* remove unnecessary test cases and fix build

* fix tests and add migration docs

* fix connection version check in conn open ack

* add changelog entry

* Update modules/core/03-connection/keeper/handshake.go

Co-authored-by: Aditya <[email protected]>

* remove unnecessary testing function

* improve migration documentation as per review suggestion

Co-authored-by: Aditya <[email protected]>
(cherry picked from commit 9aab42d)

* fix merge conflicts

* remove missed merge conflicts

* Update docs/migrations/v3-to-v4.md

Co-authored-by: colin axnér <[email protected]>
@ulbqb ulbqb mentioned this pull request Jul 31, 2023
9 tasks
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.

2 participants