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

api!: rename path to merkle path for contract api json msgs (backport #6962) #6984

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 29, 2024

Description

This was already merged in the release branches, but not yet in main.

closes: #XXXX


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against the correct branch (see CONTRIBUTING.md).
  • Linked to GitHub issue with discussion and accepted design, OR link to spec that describes this work.
  • Code follows the module structure standards and Go style guide.
  • Wrote unit and integration tests.
  • Updated relevant documentation (docs/).
  • Added relevant godoc comments.
  • Provide a conventional commit message to follow the repository standards.
  • Include a descriptive changelog entry when appropriate. This may be left to the discretion of the PR reviewers. (e.g. chores should be omitted from changelog)
  • Re-reviewed Files changed in the GitHub PR explorer.
  • Review SonarCloud Report in the comment section below once CI passes.

This is an automatic backport of pull request #6962 done by [Mergify](https://mergify.com).

* api!: rename path to merkle path for contract api json msgs

* fix

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
(cherry picked from commit 5a6b4ae)

# Conflicts:
#	modules/light-clients/08-wasm/CHANGELOG.md
Copy link
Contributor Author

mergify bot commented Jul 29, 2024

Cherry-pick of 5a6b4ae has failed:

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

You are currently cherry-picking commit 5a6b4ae0.
  (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:   modules/light-clients/08-wasm/types/contract_api.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/light-clients/08-wasm/CHANGELOG.md

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

@DimitrisJim DimitrisJim self-assigned this Jul 29, 2024
Copy link

sonarcloud bot commented Jul 29, 2024

@DimitrisJim
Copy link
Contributor

not sure why we're bp this? we don't typically cut the wasm release from the ibc release branch it corresponds to?

@colin-axner
Copy link
Contributor

yea lets close. I wonder if we should start rm'ing the separate go.mod's from ibc-go release branch

@mergify mergify bot deleted the mergify/bp/release/v9.0.x/pr-6962 branch July 30, 2024 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants