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

Correct missing entry handling to avoid bad warns (bp #8339) #8378

Merged
merged 2 commits into from
Feb 21, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2020

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

Cherry-pick of d238371 has failed:

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

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

Changes to be committed:

	modified:   core/src/snapshot_packager_service.rs
	modified:   core/tests/bank_forks.rs
	modified:   ledger-tool/src/main.rs
	modified:   ledger/src/bank_forks.rs
	modified:   ledger/src/snapshot_package.rs
	modified:   ledger/src/snapshot_utils.rs
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/accounts_db.rs

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

	both modified:   runtime/src/bank.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
  • @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/

* Correct missing entry handling to avoid bad warns

* Pass storage entries to AccountStorageSerialize

* Fix CI.....

* Add tests and reorder condition for cheapest first

* Remove unneeded reference

(cherry picked from commit d238371)

# Conflicts:
#	runtime/src/bank.rs
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 21, 2020
@solana-grimes solana-grimes merged commit c2b17c7 into v0.23 Feb 21, 2020
@codecov
Copy link

codecov bot commented Feb 21, 2020

Codecov Report

Merging #8378 into v0.23 will increase coverage by <.1%.
The diff coverage is 86.3%.

@@           Coverage Diff           @@
##           v0.23   #8378     +/-   ##
=======================================
+ Coverage   80.7%   80.7%   +<.1%     
=======================================
  Files        251     251             
  Lines      55076   55129     +53     
=======================================
+ Hits       44475   44520     +45     
- Misses     10601   10609      +8

@mergify mergify bot deleted the mergify/bp/v0.23/pr-8339 branch February 21, 2020 07:35
# for free to subscribe to this conversation on GitHub. Already have an account? #.
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