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(types): use correct bit length constant for sdk.Dec (backport #11332) #11335

Merged
merged 2 commits into from
Mar 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2022

This is an automatic backport of pull request #11332 done by Mergify.
Cherry-pick of 3d3cf25 has failed:

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

You are currently cherry-picking commit 3d3cf2554.
  (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/decimal.go
	modified:   types/decimal_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit 3d3cf25)

# Conflicts:
#	go.sum
@mergify mergify bot added the conflicts label Mar 8, 2022
@atheeshp
Copy link
Contributor

atheeshp commented Mar 9, 2022

@julienrbrt can you look into the failing jobs here, thanks!

@julienrbrt
Copy link
Member

julienrbrt commented Mar 9, 2022

After accepting both changes (current + incoming), go mod tidy should be re-ran, and it should solve it.
@atheeshp As I am a Contributor, I have no pushing right in this branch, so I cannot fix that.

@tac0turtle tac0turtle merged commit 11bda92 into release/v0.45.x Mar 9, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-11332 branch March 9, 2022 12:26
JimLarson pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Jul 7, 2022
…mos#11332) (cosmos#11335)

* Use correct bit length constant for sdk.Dec (cosmos#11332)

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit 3d3cf25)

# Conflicts:
#	go.sum

* fix conflicts

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
…mos#11332) (cosmos#11335)

* Use correct bit length constant for sdk.Dec (cosmos#11332)

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit 3d3cf25)

# Conflicts:
#	go.sum

* fix conflicts

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
…mos#11332) (cosmos#11335)

* Use correct bit length constant for sdk.Dec (cosmos#11332)

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit 3d3cf25)

# Conflicts:
#	go.sum

* fix conflicts

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
…mos#11332) (cosmos#11335)

* Use correct bit length constant for sdk.Dec (cosmos#11332)

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit 3d3cf25)

* fix conflicts

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants