Uses AccountHash in StorableAccountsWithHashesAndWriteVersions #33751
Conversation
This file contains 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
brooksprumo
force-pushed
the
account-hash/StorableAccountsWithHashesAndWriteVersions
branch
from
9e5d2a2
to
e2f6683
Compare
brooksprumo
commented
Oct 18, 2023
| @@ -30,7 +31,7 @@ pub struct StorableAccountsWithHashesAndWriteVersions< | |||
| 'b, | |||
| T: ReadableAccount + Sync + 'b, | |||
| U: StorableAccounts<'a, T>, | |||
| V: Borrow<Hash>, | |||
There was a problem hiding this comment.
This is the main change.
Comment on lines
+128
to
+133
| pub fn hash(&self) -> &'storage AccountHash { | ||
| let hash = match self { | ||
| Self::AppendVec(av) => av.hash(), | ||
| Self::Hot(hot) => hot.hash().unwrap_or(&DEFAULT_ACCOUNT_HASH), | ||
| } | ||
| Self::Hot(hot) => hot.hash().unwrap_or(&DEFAULT_ACCOUNT_HASH.0), | ||
| }; | ||
| bytemuck::cast_ref(hash) |
There was a problem hiding this comment.
Subsequent PRs will handle returning AccountHash from the underlying AppendVec and TieredStorage. For now, it's safe to cast them.
| @@ -6612,7 +6612,7 @@ impl AccountsDb { | |||
| let pubkeys = self.get_filler_account_pubkeys(filler_accounts as usize); | |||
| pubkeys.iter().for_each(|key| { | |||
| accounts.push((key, &account)); | |||
| hashes.push(hash); | |||
| hashes.push(AccountHash(hash)); | |||
There was a problem hiding this comment.
This will be fixed up (i.e. go away) once a subsequent PR changes get_filler_account_pubkeys() to return an AccountHash instead of a bare Hash.
brooksprumo
force-pushed
the
account-hash/StorableAccountsWithHashesAndWriteVersions
branch
2 times, most recently
from
c5370a5
to
6f0056d
Compare
brooksprumo
added
CI
brooksprumo
force-pushed
the
account-hash/StorableAccountsWithHashesAndWriteVersions
branch
from
6f0056d
to
2a62ecd
Compare
|
Rebased and force-pushed to address a merge conflict. No new changes were made. |
Codecov Report
@@ Coverage Diff @@
## master #33751 +/- ##
=======================================
Coverage 81.8% 81.8%
=======================================
Files 806 806
Lines 217908 217911 +3
=======================================
+ Hits 178270 178297 +27
+ Misses 39638 39614 -24 |
brooksprumo
deleted the
account-hash/StorableAccountsWithHashesAndWriteVersions
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Now that we added
AccountHashin #33597, we can use it in places where we were previously using a bareHash. One of those places is inStorableAccountsWithHashesAndWriteVersions.Summary of Changes
Use
AccountHashinstead of bareHashinStorableAccountsWithHashesAndWriteVersions.