This repository was archived by the owner on Jan 22, 2025. It is now read-only.
Re-do rent collection check on rent-exempt account (bp #11349)#11654
Merged
mergify[bot] merged 3 commits intov1.2from Aug 17, 2020
Merged
Re-do rent collection check on rent-exempt account (bp #11349)#11654mergify[bot] merged 3 commits intov1.2from
mergify[bot] merged 3 commits intov1.2from
Conversation
* wip: re-do rent collection check on rent-exempt account * Let's see how the ci goes * Restore previous code * Well, almost all new changes are revertable * Update doc * Add test and gating * Fix tests * Fix tests, especially avoid to change abi... * Fix more tests... * Fix snapshot restore * Align to _new_ with better uninitialized detection (cherry picked from commit 23fa84b) # Conflicts: # core/src/rpc_subscriptions.rs # core/tests/bank_forks.rs # runtime/src/bank.rs
mergify
Bot
added
conflicts
automerge
Contributor
Author
|
automerge label removed due to a CI failure |
mergify
Bot
added
the
automerge
ryoqun
reviewed
Aug 17, 2020
| ), | ||
| CompressionType::Bzip2, | ||
| &GenesisConfig::default(), | ||
| old_genesis_config, |
Contributor
There was a problem hiding this comment.
This spent some time for me to figure out why the test has started to failing.....
ryoqun
reviewed
Aug 17, 2020
| new | ||
| } | ||
|
|
||
| <<<<<<< HEAD |
ryoqun
reviewed
Aug 17, 2020
| fn restore_from_snapshot( | ||
| old_bank_forks: &BankForks, | ||
| old_last_slot: Slot, | ||
| old_genesis_config: &GenesisConfig, |
Codecov Report
@@ Coverage Diff @@
## v1.2 #11654 +/- ##
========================================
- Coverage 81.9% 81.9% -0.1%
========================================
Files 320 320
Lines 76427 76471 +44
========================================
+ Hits 62651 62682 +31
- Misses 13776 13789 +13 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated backport of pull request #11349 done by Mergify
Cherry-pick of 23fa84b has failed:
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/