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

Adopt heaviest subtree fork choice rule (bp #10441) #10515

Merged
merged 1 commit into from
Jun 12, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 11, 2020

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

Cherry-pick of 2e1d59f has failed:

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

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

Changes to be committed:

	new file:   core/src/bank_weight_fork_choice.rs
	new file:   core/src/fork_choice.rs
	new file:   core/src/heaviest_subtree_fork_choice/fork_choice.rs
	new file:   core/src/heaviest_subtree_fork_choice/mod.rs
	modified:   core/src/lib.rs
	modified:   local-cluster/tests/local_cluster.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/epoch_stakes.rs

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

	both modified:   core/src/consensus.rs
	both modified:   core/src/replay_stage.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 simulator.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jun 11, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 11, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 12, 2020
* Add HeaviestSubtreeForkChoice

* Make replay stage switch between two fork choice rules

Co-authored-by: Carl <carl@solana.com>
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 12, 2020
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 12, 2020
@codecov
Copy link

codecov bot commented Jun 12, 2020

Codecov Report

Merging #10515 into v1.2 will increase coverage by 0.1%.
The diff coverage is 96.3%.

@@           Coverage Diff            @@
##            v1.2   #10515     +/-   ##
========================================
+ Coverage   81.6%    81.7%   +0.1%     
========================================
  Files        293      296      +3     
  Lines      69249    69720    +471     
========================================
+ Hits       56518    57027    +509     
+ Misses     12731    12693     -38     

@solana-grimes solana-grimes merged commit 7937c45 into v1.2 Jun 12, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-10441 branch June 12, 2020 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants