This repository was archived by the owner on Jan 22, 2025. It is now read-only.
uses named fields for RentResullt::CollectRent enum variant#26449
Merged
behzadnouri merged 1 commit intosolana-labs:masterfrom Jul 6, 2022
Merged
uses named fields for RentResullt::CollectRent enum variant#26449behzadnouri merged 1 commit intosolana-labs:masterfrom
behzadnouri merged 1 commit intosolana-labs:masterfrom
Conversation
mergify Bot
pushed a commit
that referenced
this pull request
Jul 10, 2022
Avoiding ambiguous raw tuple:
CollectRent((Epoch, u64))
Using named fields instead:
CollectRent {
new_rent_epoch: Epoch,
rent_due: u64,
},
(cherry picked from commit d7201a8)
# Conflicts:
# runtime/src/bank.rs
# runtime/src/expected_rent_collection.rs
# runtime/src/rent_collector.rs
mergify Bot
added a commit
that referenced
this pull request
Jul 10, 2022
* names fields in RentResullt::CollectRent enum variant (#26449) Avoiding ambiguous raw tuple: CollectRent((Epoch, u64)) Using named fields instead: CollectRent { new_rent_epoch: Epoch, rent_due: u64, }, (cherry picked from commit d7201a8) # Conflicts: # runtime/src/bank.rs # runtime/src/expected_rent_collection.rs # runtime/src/rent_collector.rs * removes mergify merge conflicts * preserves rent_epoch for rent exempt accounts (#26479) #22292 prevents rent paying account creation going forward. As a result rent_epoch field for rent exempt accounts is redundant, and advancing this field will incur expensive account rewrites and cause discrepancy between accounts-db and cached vote/stake accounts. This commit adds a feature which upon activation preserves rent_epoch field for rent exempt accounts so that the field is frozen and is no longer advanced. (cherry picked from commit c99d9f0) Co-authored-by: behzad nouri <behzadnouri@gmail.com>
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.
2 participants
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.
Problem
Raw tuple
CollectRent((Epoch, u64))is ambiguous.Summary of Changes
Use named fields: