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: switch Int and Uint to cosmossdk.io/math (backport #481) #486

Merged
merged 1 commit into from
Sep 7, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 7, 2023

This is an automatic backport of pull request #481 done by Mergify.
Cherry-pick of 15e144a has failed:

On branch mergify/bp/v16.x/pr-481
Your branch is up to date with 'origin/v16.x'.

You are currently cherry-picking commit 15e144a1b.
  (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:   types/coin.go
	modified:   types/dec_coin.go
	modified:   types/decimal.go
	modified:   types/denom.go
	deleted:    types/int.go
	deleted:    types/int_internal_test.go
	deleted:    types/int_test.go
	new file:   types/math.go
	deleted:    types/uint.go
	deleted:    types/uint_internal_test.go
	deleted:    types/uint_test.go
	modified:   x/auth/vesting/types/vesting_account.go
	modified:   x/distribution/keeper/delegation_test.go
	modified:   x/distribution/keeper/validator.go
	modified:   x/gov/keeper/deposit.go
	modified:   x/gov/keeper/tally.go
	modified:   x/gov/simulation/operations.go
	modified:   x/slashing/handler_test.go
	modified:   x/staking/app_test.go
	modified:   x/staking/genesis_test.go
	modified:   x/staking/handler_test.go
	modified:   x/staking/keeper/delegation_test.go
	modified:   x/staking/keeper/grpc_query_test.go
	modified:   x/staking/keeper/pool.go
	modified:   x/staking/keeper/querier_test.go
	modified:   x/staking/keeper/slash.go
	modified:   x/staking/keeper/slash_test.go
	modified:   x/staking/keeper/validator_test.go
	modified:   x/staking/types/msg.go
	modified:   x/staking/types/validator.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

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

@mergify mergify bot added the conflicts label Sep 7, 2023
@p0mvn p0mvn merged commit b29646d into v16.x Sep 7, 2023
31 checks passed
@p0mvn p0mvn deleted the mergify/bp/v16.x/pr-481 branch September 7, 2023 19:35
p0mvn added a commit that referenced this pull request Sep 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant