Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Enhance ledger-tool for multi-epoch rewards (bp #13837)#13838

Closed
mergify[bot] wants to merge 1 commit intov1.3from
mergify/bp/v1.3/pr-13837
Closed

Enhance ledger-tool for multi-epoch rewards (bp #13837)#13838
mergify[bot] wants to merge 1 commit intov1.3from
mergify/bp/v1.3/pr-13837

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 27, 2020

This is an automated backport of pull request #13837 done by Mergify

Cherry-pick of 6048342 has failed:

On branch mergify/bp/v1.3/pr-13837
Your branch is up to date with 'origin/v1.3'.

You are currently cherry-picking commit 6048342c5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   programs/stake/src/stake_state.rs
	modified:   runtime/src/bank.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   ledger-tool/src/main.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

* Support ledger-tool for multi-epoch rewards

* nits

* Ensure not to skip some records in csv

(cherry picked from commit 6048342)

# Conflicts:
#	ledger-tool/src/main.rs
@mergify mergify Bot added the conflicts label Nov 27, 2020
@ryoqun
Copy link
Copy Markdown
Contributor

ryoqun commented Nov 27, 2020

hmm, I might fix this conflicts later...

@codecov
Copy link
Copy Markdown

codecov Bot commented Nov 27, 2020

Codecov Report

Merging #13838 (6048342) into v1.3 (51e8872) will decrease coverage by 0.4%.
The diff coverage is 67.4%.

@@           Coverage Diff            @@
##            v1.3   #13838     +/-   ##
========================================
- Coverage   82.5%    82.0%   -0.5%     
========================================
  Files        368      381     +13     
  Lines      88151    93220   +5069     
========================================
+ Hits       72744    76530   +3786     
- Misses     15407    16690   +1283     

@ryoqun
Copy link
Copy Markdown
Contributor

ryoqun commented Nov 27, 2020

Codecov Report

Merging #13838 (6048342) into v1.3 (51e8872) will decrease coverage by 0.4%.
The diff coverage is 67.4%.

@@           Coverage Diff            @@
##            v1.3   #13838     +/-   ##
========================================
- Coverage   82.5%    82.0%   -0.5%     
========================================
  Files        368      381     +13     
  Lines      88151    93220   +5069     
========================================
+ Hits       72744    76530   +3786     
- Misses     15407    16690   +1283     

how could codecov manage to report this even if the coverage build didn't run at all???

@ryoqun
Copy link
Copy Markdown
Contributor

ryoqun commented Dec 3, 2020

I abandon back-porting this.

@ryoqun ryoqun closed this Dec 3, 2020
@mergify mergify Bot deleted the mergify/bp/v1.3/pr-13837 branch December 3, 2020 05:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant