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

chore: update upstream gravity module to fix halt bug (backport #932) #933

Merged
merged 2 commits into from
May 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 20, 2022

This is an automatic backport of pull request #932 done by Mergify.
Cherry-pick of 7f178e3 has failed:

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

You are currently cherry-picking commit 7f178e3.
  (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:   go.mod
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   price-feeder/go.mod
	both modified:   price-feeder/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

* go get github.com/Gravity-Bridge/Gravity-Bridge/module@8d660b559b0718c6ff4e20f3b355d94501d8dbb3

* bump gravity module on price-feeder as well to 8d660b559b07

(cherry picked from commit 7f178e3)

# Conflicts:
#	price-feeder/go.mod
#	price-feeder/go.sum
@mergify mergify bot requested a review from a team as a code owner May 20, 2022 18:01
@mergify mergify bot added the conflicts label May 20, 2022
@dreamcodez dreamcodez self-requested a review May 20, 2022 18:02
@codecov-commenter
Copy link

Codecov Report

Merging #933 (7f178e3) into release/v2.x.x (1774b8b) will increase coverage by 0.13%.
The diff coverage is 32.74%.

❗ Current head 7f178e3 differs from pull request most recent head 924c31a. Consider uploading reports for the commit 924c31a to get more accurate results

Impacted file tree graph

@@                Coverage Diff                 @@
##           release/v2.x.x     #933      +/-   ##
==================================================
+ Coverage           50.76%   50.90%   +0.13%     
==================================================
  Files                  64       64              
  Lines                9483     9479       -4     
==================================================
+ Hits                 4814     4825      +11     
+ Misses               4424     4401      -23     
- Partials              245      253       +8     
Impacted Files Coverage Δ
ante/fee.go 93.61% <ø> (ø)
ante/spam_prevention.go 61.76% <ø> (ø)
x/ibctransfer/keeper/keeper.go 77.02% <ø> (ø)
x/leverage/abci.go 0.00% <ø> (ø)
x/leverage/client/cli/proposal.go 72.72% <ø> (ø)
x/leverage/client/cli/query.go 0.00% <0.00%> (ø)
x/leverage/client/cli/tx.go 0.00% <ø> (ø)
x/leverage/genesis.go 50.00% <ø> (ø)
x/leverage/keeper/collateral.go 83.33% <ø> (ø)
x/leverage/keeper/exchange_rate.go 61.81% <ø> (ø)
... and 65 more

@toteki toteki merged commit 86842a2 into release/v2.x.x May 20, 2022
@toteki toteki deleted the mergify/bp/release/v2.x.x/pr-932 branch May 20, 2022 18: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.

3 participants