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

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2021

This is an automatic backport of pull request #17698 done by Mergify.
Cherry-pick of 544b3c0 has failed:

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

You are currently cherry-picking commit 544b3c0d1.
  (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:   Cargo.toml
	modified:   banking-bench/src/main.rs
	modified:   ci/test-bench.sh
	modified:   core/src/banking_stage.rs
	modified:   core/src/broadcast_stage.rs
	modified:   core/src/broadcast_stage/broadcast_utils.rs
	modified:   core/src/cluster_info_vote_listener.rs
	modified:   core/src/fetch_stage.rs
	modified:   core/src/lib.rs
	modified:   core/src/replay_stage.rs
	modified:   core/src/test_validator.rs
	modified:   core/src/tpu.rs
	modified:   core/src/tvu.rs
	modified:   core/src/validator.rs
	renamed:    core/src/bigtable_upload_service.rs -> ledger/src/bigtable_upload_service.rs
	modified:   ledger/src/lib.rs
	modified:   local-cluster/src/cluster_tests.rs
	new file:   poh/.gitignore
	new file:   poh/Cargo.toml
	renamed:    core/benches/poh.rs -> poh/benches/poh.rs
	renamed:    core/benches/poh_verify.rs -> poh/benches/poh_verify.rs
	new file:   poh/src/lib.rs
	renamed:    core/src/poh_recorder.rs -> poh/src/poh_recorder.rs
	renamed:    core/src/poh_service.rs -> poh/src/poh_service.rs
	modified:   rpc/src/lib.rs
	renamed:    core/src/rpc.rs -> rpc/src/rpc.rs
	renamed:    core/src/rpc_health.rs -> rpc/src/rpc_health.rs
	renamed:    core/src/rpc_service.rs -> rpc/src/rpc_service.rs
	renamed:    core/src/send_transaction_service.rs -> rpc/src/send_transaction_service.rs
	renamed:    core/src/transaction_status_service.rs -> rpc/src/transaction_status_service.rs
	modified:   stake-monitor/src/lib.rs
	modified:   validator/src/bin/solana-test-validator.rs
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   banking-bench/Cargo.toml
	both modified:   core/Cargo.toml
	both modified:   core/benches/banking_stage.rs
	both modified:   local-cluster/Cargo.toml
	both modified:   rpc/Cargo.toml
	both modified:   stake-monitor/Cargo.toml
	both modified:   validator/Cargo.toml

To fix up this pull request, you can check it out 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/

* Create solana-poh crate

* Move BigTableUploadService to solana-ledger

* Add solana-rpc to workspace

* Move dependencies to solana-rpc

* Move remaining rpc modules to solana-rpc

* Single use statement solana-poh

* Single use statement solana-rpc

(cherry picked from commit 544b3c0)

# Conflicts:
#	Cargo.lock
#	banking-bench/Cargo.toml
#	core/Cargo.toml
#	core/benches/banking_stage.rs
#	local-cluster/Cargo.toml
#	rpc/Cargo.toml
#	stake-monitor/Cargo.toml
#	validator/Cargo.toml
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 4, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 4, 2021

automerge label removed due to a CI failure

@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.7/pr-17698 branch from 9ee2b79 to fcffa29 Compare June 4, 2021 16:05
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 4, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 4, 2021

automerge label removed due to a CI failure

@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.7/pr-17698 branch from fcffa29 to 7826243 Compare June 4, 2021 16:13
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 4, 2021
@codecov
Copy link

codecov bot commented Jun 4, 2021

Codecov Report

Merging #17745 (7826243) into v1.7 (498bf91) will increase coverage by 0.0%.
The diff coverage is 95.2%.

@@           Coverage Diff            @@
##             v1.7   #17745    +/-   ##
========================================
  Coverage    82.5%    82.6%            
========================================
  Files         428      432     +4     
  Lines      119545   120034   +489     
========================================
+ Hits        98741    99253   +512     
+ Misses      20804    20781    -23     

@mergify mergify bot merged commit e247625 into v1.7 Jun 4, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17698 branch June 4, 2021 18:19
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

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