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

deps: use ibc-apps rate limiter import (backport #3227) #3228

Merged
merged 2 commits into from
Jul 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 23, 2024

Uses ibc-apps/rate-limiter.

Stride-labs implementation was moved the implementation to ibc-apps repo. This implementation is equivalent to the one from stride, there should be no differences in logic.


This is an automatic backport of pull request #3227 done by Mergify.

* deps: use ibc-apps rate limiter import

* appease linter

* appease changelogs

(cherry picked from commit 8535cad)

# Conflicts:
#	.changelog/v19.0.0/dependencies/3227-bump-ibc-rate-limits.md
@mergify mergify bot requested a review from zmanian as a code owner July 23, 2024 07:20
@mergify mergify bot added the conflicts label Jul 23, 2024
@mergify mergify bot requested review from crodriguezvega, jackzampolin and a team as code owners July 23, 2024 07:20
Copy link
Contributor Author

mergify bot commented Jul 23, 2024

Cherry-pick of 8535cad has failed:

On branch mergify/bp/release/v19.x/pr-3227
Your branch is up to date with 'origin/release/v19.x'.

You are currently cherry-picking commit 8535cad.
  (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:   ante/gov_vote_ante.go
	modified:   app/keepers/keepers.go
	modified:   app/keepers/keys.go
	modified:   app/modules.go
	modified:   cmd/gaiad/cmd/testnet_set_local_validator.go
	modified:   go.mod
	modified:   go.sum
	modified:   tests/e2e/chain.go
	modified:   tests/e2e/query.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   .changelog/v19.0.0/dependencies/3227-bump-ibc-rate-limits.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

@MSalopek MSalopek merged commit 3f54062 into release/v19.x Jul 23, 2024
17 checks passed
@MSalopek MSalopek deleted the mergify/bp/release/v19.x/pr-3227 branch July 23, 2024 07:55
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