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: Fix Evidence CLI query flag parsing (backport #13458) #14799

Merged
merged 3 commits into from
Jan 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 27, 2023

This is an automatic backport of pull request #13458 done by Mergify.
Cherry-pick of 709b4e2 has failed:

On branch mergify/bp/release/v0.46.x/pr-13458
Your branch is up to date with 'origin/release/v0.46.x'.

You are currently cherry-picking commit 709b4e2ca.
  (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/evidence/client/cli/query.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x/evidence/client/cli/tx_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

(cherry picked from commit 709b4e2)

# Conflicts:
#	x/evidence/client/cli/tx_test.go
@mergify mergify bot requested a review from a team as a code owner January 27, 2023 04:28
@mergify mergify bot added the conflicts label Jan 27, 2023
@yihuang yihuang removed the conflicts label Jan 27, 2023
@julienrbrt
Copy link
Member

Removing the test, as it depends on our testutil from v0.47+.
It is tested in v0.47+ so fairly confident it works too in v0.46 with the exact same fix.

@julienrbrt julienrbrt enabled auto-merge (squash) January 27, 2023 10:20
@julienrbrt julienrbrt merged commit c8d250a into release/v0.46.x Jan 27, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.46.x/pr-13458 branch January 27, 2023 11:04
SpicyLemon added a commit to provenance-io/cosmos-sdk that referenced this pull request Feb 16, 2023
…518)

* fix: Fix Evidence CLI query flag parsing (backport cosmos#13458) (cosmos#14799)

Co-authored-by: Likhita Polavarapu <[email protected]>
Co-authored-by: HuangYi <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* fix: nested iterator on cache store (cosmos#14798)

* chore: update IAVL  (backport cosmos#14830) (cosmos#14835)

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

* Mark v0.46.8-pio-2 in the changelog and release notes.

* feat: add config `iavl-lazy-loading` to enable lazy loading of iavl store (backport cosmos#14189) (cosmos#14862)

Co-authored-by: yihuang <[email protected]>
Co-authored-by: marbar3778 <[email protected]>

* chore: bump IAVL to v0.19.5 (backport cosmos#14889) (cosmos#14892)

Co-authored-by: Julien Robert <[email protected]>

* build(deps): bump tendermint to v0.34.25 (cosmos#14903)

* build(deps): bump tendermint to v0.34.26 (cosmos#14911)

* fix: return named error for write validators (backport cosmos#14919) (cosmos#14921)

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* Bump Tendermint to v0.34.25 (from v0.34.24). (#498)

* Fix a few listener proto comments. (#499)

* build(deps): bump btcd in v0.46 (cosmos#14846)

Co-authored-by: yihuang <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
Co-authored-by: Elias Naur <[email protected]>
Co-authored-by: Marko <[email protected]>

* ci: update release slack channel and algolia api key (backport cosmos#14942) (cosmos#14945)

Co-authored-by: Julien Robert <[email protected]>

* feat: support profiling block replay during abci handshake (backport cosmos#14953) (cosmos#14964)

Co-authored-by: yihuang <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* Revert "Revert cosmos#14349 - cache iterator optimizations (#444)"

This reverts commit cd9d192.

* Mark v0.46.8-pio-3 in the changelog and release notes.

* fix: avoid broadcasting tx through query (backport cosmos#15044) (cosmos#15047)

Co-authored-by: Facundo Medica <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* Add CLI commands for sanction Tx gov props (#510)

* Fix the changelog.

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Likhita Polavarapu <[email protected]>
Co-authored-by: HuangYi <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
Co-authored-by: Marko <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Robert Zaremba <[email protected]>
Co-authored-by: Elias Naur <[email protected]>
Co-authored-by: Facundo Medica <[email protected]>
ankurdotb pushed a commit to cheqd/cosmos-sdk that referenced this pull request Feb 28, 2023
…mos#14799)

Co-authored-by: Likhita Polavarapu <[email protected]>
Co-authored-by: HuangYi <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…mos#14799)

Co-authored-by: Likhita Polavarapu <[email protected]>
Co-authored-by: HuangYi <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
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.

4 participants