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

remove expected rent collection and rehashing completely (backport #28422) #28531

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 21, 2022

This is an automatic backport of pull request #28422 done by Mergify.
Cherry-pick of 28a89a1 has failed:

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

You are currently cherry-picking commit 28a89a1d9.
  (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:   runtime/src/bank.rs
	modified:   runtime/src/lib.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   accounts-bench/src/main.rs
	both modified:   core/src/accounts_hash_verifier.rs
	deleted by us:   core/tests/epoch_accounts_hash.rs
	both modified:   runtime/benches/accounts.rs
	both modified:   runtime/src/accounts_background_service.rs
	both modified:   runtime/src/accounts_db.rs
	deleted by them: runtime/src/expected_rent_collection.rs
	both modified:   runtime/src/snapshot_package.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

(cherry picked from commit 28a89a1)

# Conflicts:
#	accounts-bench/src/main.rs
#	core/src/accounts_hash_verifier.rs
#	core/tests/epoch_accounts_hash.rs
#	runtime/benches/accounts.rs
#	runtime/src/accounts_background_service.rs
#	runtime/src/accounts_db.rs
#	runtime/src/expected_rent_collection.rs
#	runtime/src/snapshot_package.rs
@mergify mergify bot added the conflicts label Oct 21, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2022
@jeffwashington
Copy link
Contributor

this may be the source of a bank hash mismatch error. Preparing just in case.

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Oct 21, 2022

automerge label removed due to a CI failure

@jeffwashington
Copy link
Contributor

this was done as part of #28532

@mergify mergify bot deleted the mergify/bp/v1.14/pr-28422 branch October 24, 2022 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant