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: replace error string in transfer acks with const (backport #818) #992

Merged
merged 4 commits into from
Mar 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2022

This is an automatic backport of pull request #818 done by Mergify.
Cherry-pick of ac46ac0 has failed:

On branch mergify/bp/release/v1.3.x/pr-818
Your branch is up to date with 'origin/release/v1.3.x'.

You are currently cherry-picking commit ac46ac0.
  (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:
	new file:   modules/apps/transfer/types/ack.go
	new file:   modules/apps/transfer/types/ack_test.go
	modified:   modules/core/04-channel/types/acknowledgement.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   modules/apps/27-interchain-accounts/host/types/ack.go
	deleted by us:   modules/apps/transfer/ibc_module.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

* fix: adding ack error string const for transfer

* updating godoc

* adding warning note to godoc in 04-channel

* updating to include abci error code, and copy tests from ica

* adding changelog entry

(cherry picked from commit ac46ac0)

# Conflicts:
#	CHANGELOG.md
#	modules/apps/27-interchain-accounts/host/types/ack.go
#	modules/apps/transfer/ibc_module.go
@crodriguezvega crodriguezvega merged commit a8058e2 into release/v1.3.x Mar 1, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v1.3.x/pr-818 branch March 1, 2022 12:03
CosmosCar pushed a commit to caelus-labs/ibc-go that referenced this pull request Nov 6, 2023
## Overview
This depends on rollkit/rollkit#963. As part of
Stage 2 of rollkit/rollkit#954, this PR
intends to replace all of the waitgroups in the helpers and tests with
retry checks.

## Checklist
- [ ] New and updated code has appropriate documentation
- [ ] New and updated code has new and/or updated testing
- [ ] Required CI checks are passing
- [ ] Visual proof for any user facing features like CLI or
documentation updates
- [ ] Linked issues closed with keywords

---------

Co-authored-by: Connor O'Hara <connor@switchboard.xyz>
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