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

Fix blockstore empty panic (bp #11423) #11429

Merged
merged 2 commits into from
Aug 7, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 6, 2020

This is an automated backport of pull request #11423 done by Mergify

Cherry-pick of 1061b50 has failed:

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

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

Changes to be committed:

	modified:   ledger/src/blockstore_db.rs

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

	both modified:   ledger/src/blockstore.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 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 simulator.

Finally, you can contact us on https://mergify.io/

* Add panicking test

* Add failing test: fresh transaction-status column shouldn't point at valid root 0

* Prevent transaction status match outside of primary-index bounds

* Initialize transaction-status and address-signature primer entries with Slot::MAX

* Revert "Add failing test: fresh transaction-status column shouldn't point at valid root 0"

This reverts commit cbad2a9.

* Revert "Initialize transaction-status and address-signature primer entries with Slot::MAX"

This reverts commit ffaeac0.

(cherry picked from commit 1061b50)

# Conflicts:
#	ledger/src/blockstore.rs
@mergify mergify bot added the conflicts label Aug 6, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 6, 2020
@codecov
Copy link

codecov bot commented Aug 7, 2020

Codecov Report

Merging #11429 into v1.2 will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff            @@
##            v1.2   #11429     +/-   ##
========================================
- Coverage   81.8%    81.8%   -0.1%     
========================================
  Files        315      315             
  Lines      75330    75339      +9     
========================================
+ Hits       61673    61679      +6     
- Misses     13657    13660      +3     

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.

1 participant