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: getting bonded validator power in oracle endblocker (backport #1845) #1848

Merged
merged 2 commits into from
Feb 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 17, 2023

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

On branch mergify/bp/release/v4.1.x/pr-1845
Your branch is up to date with 'origin/release/v4.1.x'.

You are currently cherry-picking commit c258acc.
  (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:   CHANGELOG.md
	modified:   x/oracle/abci.go
	modified:   x/oracle/abci_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/e2e/e2e_setup_test.go
	both modified:   tests/e2e/e2e_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

* fix validator power

* Floating point math and unit test

* fix e2e

* CHANGELOG++

---------

Co-authored-by: toteki <63419657+toteki@users.noreply.github.com>
(cherry picked from commit c258acc)

# Conflicts:
#	tests/e2e/e2e_setup_test.go
#	tests/e2e/e2e_test.go
@mergify mergify bot requested review from a team as code owners February 17, 2023 23:25
@mergify mergify bot added the conflicts label Feb 17, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #1848 (e5be033) into release/v4.1.x (b0d054a) will increase coverage by 0.04%.
The diff coverage is 100.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Impacted file tree graph

@@                Coverage Diff                 @@
##           release/v4.1.x    #1848      +/-   ##
==================================================
+ Coverage           57.82%   57.86%   +0.04%     
==================================================
  Files                  78       78              
  Lines                8139     8147       +8     
==================================================
+ Hits                 4706     4714       +8     
  Misses               3078     3078              
  Partials              355      355              
Impacted Files Coverage Δ
x/oracle/abci.go 80.90% <100.00%> (+1.49%) ⬆️

@toteki toteki merged commit f49bae9 into release/v4.1.x Feb 18, 2023
@toteki toteki deleted the mergify/bp/release/v4.1.x/pr-1845 branch February 18, 2023 01:51
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