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

refactor(staking): use validator & address codecs in staking (backport #16958) #17066

Merged
merged 6 commits into from
Jul 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 19, 2023

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

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

You are currently cherry-picking commit c23505b03.
  (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:   api/cosmos/staking/v1beta1/staking.pulsar.go
	modified:   proto/cosmos/staking/v1beta1/staking.proto
	modified:   tests/e2e/distribution/grpc_query_suite.go
	modified:   tests/integration/distribution/keeper/grpc_query_test.go
	modified:   tests/integration/staking/keeper/delegation_test.go
	modified:   tests/integration/staking/keeper/slash_test.go
	modified:   tests/integration/staking/keeper/unbonding_test.go
	modified:   testutil/sims/app_helpers.go
	modified:   x/distribution/keeper/delegation_test.go
	modified:   x/distribution/keeper/grpc_query.go
	modified:   x/distribution/keeper/invariants.go
	modified:   x/distribution/simulation/operations.go
	modified:   x/distribution/testutil/expected_keepers_mocks.go
	modified:   x/distribution/testutil/staking_helper.go
	modified:   x/distribution/types/expected_keepers.go
	modified:   x/distribution/types/query.go
	modified:   x/gov/keeper/tally.go
	modified:   x/slashing/abci_test.go
	modified:   x/slashing/keeper/msg_server_test.go
	modified:   x/staking/keeper/delegation.go
	modified:   x/staking/keeper/delegation_test.go
	modified:   x/staking/keeper/genesis.go
	modified:   x/staking/keeper/grpc_query.go
	modified:   x/staking/keeper/invariants.go
	modified:   x/staking/keeper/msg_server.go
	modified:   x/staking/keeper/msg_server_test.go
	modified:   x/staking/keeper/query_utils.go
	modified:   x/staking/migrations/v5/migrations_test.go
	modified:   x/staking/simulation/decoder_test.go
	modified:   x/staking/simulation/genesis.go
	modified:   x/staking/simulation/operations.go
	modified:   x/staking/simulation/operations_test.go
	modified:   x/staking/types/delegation.go
	modified:   x/staking/types/delegation_test.go
	modified:   x/staking/types/exported.go
	modified:   x/staking/types/staking.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   tests/integration/distribution/keeper/msg_server_test.go
	both modified:   tests/integration/staking/keeper/validator_bench_test.go
	both modified:   x/distribution/keeper/delegation.go
	both modified:   x/distribution/simulation/operations_test.go
	both modified:   x/slashing/simulation/operations_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 c23505b)

# Conflicts:
#	CHANGELOG.md
#	tests/integration/distribution/keeper/msg_server_test.go
#	tests/integration/staking/keeper/validator_bench_test.go
#	x/distribution/keeper/delegation.go
#	x/distribution/simulation/operations_test.go
#	x/slashing/simulation/operations_test.go
@julienrbrt julienrbrt mentioned this pull request Jul 19, 2023
19 tasks
@julienrbrt julienrbrt self-assigned this Jul 19, 2023
@julienrbrt julienrbrt merged commit 16ab635 into release/v0.50.x Jul 19, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16958 branch July 19, 2023 14:02
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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