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

Fix client checksum verification (backport #1234) #1238

Merged
merged 1 commit into from
Mar 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 6, 2023

This is an automatic backport of pull request #1234 done by Mergify.
Cherry-pick of 1a8019b has failed:

On branch mergify/bp/develop_sdk47/pr-1234
Your branch is up to date with 'origin/develop_sdk47'.

You are currently cherry-picking commit 1a8019b.
  (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:   x/wasm/client/cli/gov_tx_test.go
	modified:   x/wasm/client/cli/tx.go
	modified:   x/wasm/client/cli/tx_test.go
	modified:   x/wasm/keeper/proposal_integration_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/wasm/client/cli/gov_tx.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 client checksum verification

* Review comments

(cherry picked from commit 1a8019b)

# Conflicts:
#	x/wasm/client/cli/gov_tx.go
@mergify mergify bot requested a review from alpe as a code owner March 6, 2023 13:11
@mergify mergify bot added the conflicts label Mar 6, 2023
@sonarcloud
Copy link

sonarcloud bot commented Mar 6, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@alpe alpe merged commit 0b8af25 into develop_sdk47 Mar 6, 2023
@mergify mergify bot deleted the mergify/bp/develop_sdk47/pr-1234 branch March 6, 2023 15:17
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.

1 participant