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

Rename blocktree to blockstore (bp #7757) #7771

Merged
merged 3 commits into from
Jan 14, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 13, 2020

This is an automated backport of pull request #7757 done by Mergify.io

Cherry-pick of b5dba77 has failed:

On branch mergify/bp/v0.22/pr-7757
Your branch is up to date with 'origin/v0.22'.

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

Changes to be committed:

	modified:   banking-bench/src/main.rs
	modified:   book/art/validator.bob
	modified:   book/src/SUMMARY.md
	modified:   book/src/cluster/managing-forks.md
	renamed:    book/src/implemented-proposals/blocktree.md -> book/src/implemented-proposals/blockstore.md
	modified:   book/src/implemented-proposals/repair-service.md
	modified:   book/src/implemented-proposals/validator-timestamp-oracle.md
	modified:   book/src/proposals/tick_verification.md
	modified:   book/src/proposals/validator-proposal.md
	renamed:    book/src/validator/tvu/blocktree.md -> book/src/validator/tvu/blockstore.md
	modified:   core/Cargo.toml
	modified:   core/benches/banking_stage.rs
	renamed:    core/benches/blocktree.rs -> core/benches/blockstore.rs
	modified:   core/src/archiver.rs
	modified:   core/src/banking_stage.rs
	modified:   core/src/blockstream_service.rs
	modified:   core/src/broadcast_stage.rs
	modified:   core/src/broadcast_stage/broadcast_fake_shreds_run.rs
	modified:   core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
	modified:   core/src/broadcast_stage/standard_broadcast_run.rs
	modified:   core/src/chacha.rs
	modified:   core/src/chacha_cuda.rs
	modified:   core/src/cluster_info.rs
	modified:   core/src/cluster_info_repair_listener.rs
	modified:   core/src/gossip_service.rs
	modified:   core/src/poh_service.rs
	modified:   core/src/repair_service.rs
	modified:   core/src/result.rs
	modified:   core/src/retransmit_stage.rs
	modified:   core/src/rpc.rs
	modified:   core/src/rpc_service.rs
	modified:   core/src/storage_stage.rs
	modified:   core/src/tpu.rs
	modified:   core/src/tvu.rs
	modified:   core/src/validator.rs
	modified:   core/tests/storage_stage.rs
	modified:   genesis/src/main.rs
	modified:   ledger-tool/src/main.rs
	modified:   ledger/src/bank_forks_utils.rs
	renamed:    ledger/src/blocktree.rs -> ledger/src/blockstore.rs
	renamed:    ledger/src/blocktree_db.rs -> ledger/src/blockstore_db.rs
	renamed:    ledger/src/blocktree_meta.rs -> ledger/src/blockstore_meta.rs
	renamed:    ledger/src/blocktree_processor.rs -> ledger/src/blockstore_processor.rs
	modified:   ledger/src/erasure.rs
	modified:   ledger/src/leader_schedule_cache.rs
	modified:   ledger/src/lib.rs
	modified:   ledger/src/rooted_slot_iterator.rs
	renamed:    ledger/tests/blocktree.rs -> ledger/tests/blockstore.rs
	modified:   local-cluster/tests/archiver.rs
	modified:   local-cluster/tests/local_cluster.rs
	modified:   metrics/scripts/grafana-provisioning/dashboards/testnet-monitor.json

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

	both modified:   core/src/ledger_cleanup_service.rs
	both modified:   core/src/poh_recorder.rs
	both modified:   core/src/replay_stage.rs
	both modified:   core/src/shred_fetch_stage.rs
	both modified:   core/src/transaction_status_service.rs
	both modified:   core/src/window_service.rs
	both modified:   core/tests/ledger_cleanup.rs
	both modified:   local-cluster/src/cluster_tests.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 [documention](https://doc.mergify.io/).

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
  • @Mergifyio backports <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/

automerge

(cherry picked from commit b5dba77)

# Conflicts:
#	core/src/ledger_cleanup_service.rs
#	core/src/poh_recorder.rs
#	core/src/replay_stage.rs
#	core/src/shred_fetch_stage.rs
#	core/src/transaction_status_service.rs
#	core/src/window_service.rs
#	core/tests/ledger_cleanup.rs
#	local-cluster/src/cluster_tests.rs
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 13, 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 Jan 13, 2020
@codecov
Copy link

codecov bot commented Jan 13, 2020

Codecov Report

Merging #7771 into v0.22 will increase coverage by <.1%.
The diff coverage is 91%.

@@           Coverage Diff           @@
##           v0.22   #7771     +/-   ##
=======================================
+ Coverage   80.9%   80.9%   +<.1%     
=======================================
  Files        242     242             
  Lines      51109   51162     +53     
=======================================
+ Hits       41388   41438     +50     
- Misses      9721    9724      +3

@garious garious added the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2020
@solana-grimes solana-grimes merged commit a50a015 into v0.22 Jan 14, 2020
@mergify mergify bot deleted the mergify/bp/v0.22/pr-7757 branch January 14, 2020 00:16
sakridge pushed a commit to sakridge/solana that referenced this pull request Jan 14, 2020
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants