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

renames solana_runtime::vote_account::VoteAccount and makes it private (backport #19153)#22141

Merged
mergify[bot] merged 3 commits intov1.8from
mergify/bp/v1.8/pr-19153
Dec 28, 2021
Merged

renames solana_runtime::vote_account::VoteAccount and makes it private (backport #19153)#22141
mergify[bot] merged 3 commits intov1.8from
mergify/bp/v1.8/pr-19153

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 28, 2021

This is an automatic backport of pull request #19153 done by Mergify.
Cherry-pick of 1403eae has failed:

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

You are currently cherry-picking commit 1403eaeef.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/vote_account.rs

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 00e5e12 has failed:

On branch mergify/bp/v1.8/pr-19153
Your branch is ahead of 'origin/v1.8' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 00e5e1290.
  (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:   core/src/consensus.rs
	modified:   runtime/src/stake_weighted_timestamp.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/progress_map.rs
	both modified:   ledger/src/blockstore_processor.rs
	both modified:   ledger/src/staking_utils.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/epoch_stakes.rs
	both modified:   runtime/src/serde_snapshot/tests.rs
	both modified:   runtime/src/stakes.rs
	both modified:   runtime/src/vote_account.rs

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

VoteAccount is an implementation detail, and should not be public.
Only ArcVoteAccount is the public type.

(cherry picked from commit 1403eae)

# Conflicts:
#	runtime/src/vote_account.rs
Rename:
  VoteAccount    -> VoteAccountInner  # the private type
  ArcVoteAccount -> VoteAccount       # the public type
(cherry picked from commit 00e5e12)

# Conflicts:
#	core/src/progress_map.rs
#	ledger/src/blockstore_processor.rs
#	ledger/src/staking_utils.rs
#	runtime/src/bank.rs
#	runtime/src/epoch_stakes.rs
#	runtime/src/serde_snapshot/tests.rs
#	runtime/src/stakes.rs
#	runtime/src/vote_account.rs
@mergify mergify Bot added the conflicts label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 28, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin force-pushed the mergify/bp/v1.8/pr-19153 branch from f359924 to 4d89669 Compare December 28, 2021 07:54
@solana-grimes
Copy link
Copy Markdown
Contributor

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

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 28, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin force-pushed the mergify/bp/v1.8/pr-19153 branch from 4d89669 to 58a6bda Compare December 28, 2021 08:40
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 28, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin removed the conflicts label Dec 28, 2021
@behzadnouri
Copy link
Copy Markdown
Contributor

@carllin I will take care of merge conflicts

@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-19153 branch from 58a6bda to b0a978f Compare December 28, 2021 16:24
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-19153 branch from b0a978f to 60256bc Compare December 28, 2021 16:35
@solana-grimes
Copy link
Copy Markdown
Contributor

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

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 28, 2021

Codecov Report

Merging #22141 (60256bc) into v1.8 (bfb0202) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.8   #22141   +/-   ##
=======================================
  Coverage    81.5%    81.5%           
=======================================
  Files         459      459           
  Lines      130629   130618   -11     
=======================================
+ Hits       106546   106551    +5     
+ Misses      24083    24067   -16     

@mergify mergify Bot merged commit 262b157 into v1.8 Dec 28, 2021
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-19153 branch December 28, 2021 18:26
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 3, 2022
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 locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants