blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Uses `'storage` for lifetime in StoredAccountMeta (#32440)

This commit is contained in:
Brooks 2023-07-10 10:57:20 -04:00 committed by GitHub
parent 48ac48e2b2
commit 65e90ab0bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/src/account_storage/meta.rs
View File

@ -98,18 +98,18 @@ impl<'a: 'b, 'b, T: ReadableAccount + Sync + 'b, U: StorableAccounts<'a, T>, V:
/// References to account data stored elsewhere. Getting an `Account` requires cloning /// References to account data stored elsewhere. Getting an `Account` requires cloning
/// (see `StoredAccountMeta::clone_account()`). /// (see `StoredAccountMeta::clone_account()`).
#[derive(PartialEq, Eq, Debug)] #[derive(PartialEq, Eq, Debug)]
pub enum StoredAccountMeta<'a> { pub enum StoredAccountMeta<'storage> {
AppendVec(AppendVecStoredAccountMeta<'a>), AppendVec(AppendVecStoredAccountMeta<'storage>),
} }
impl<'a> StoredAccountMeta<'a> { impl<'storage> StoredAccountMeta<'storage> {
pub fn pubkey(&self) -> &'a Pubkey { pub fn pubkey(&self) -> &'storage Pubkey {
match self { match self {
Self::AppendVec(av) => av.pubkey(), Self::AppendVec(av) => av.pubkey(),
} }
} }
pub fn hash(&self) -> &'a Hash { pub fn hash(&self) -> &'storage Hash {
match self { match self {
Self::AppendVec(av) => av.hash(), Self::AppendVec(av) => av.hash(),
} }
@ -127,7 +127,7 @@ impl<'a> StoredAccountMeta<'a> {
} }
} }
pub fn data(&self) -> &'a [u8] { pub fn data(&self) -> &'storage [u8] {
match self { match self {
Self::AppendVec(av) => av.data(), Self::AppendVec(av) => av.data(),
} }
@ -151,7 +151,7 @@ impl<'a> StoredAccountMeta<'a> {
} }
} }
pub fn set_meta(&mut self, meta: &'a StoredMeta) { pub fn set_meta(&mut self, meta: &'storage StoredMeta) {
match self { match self {
Self::AppendVec(av) => av.set_meta(meta), Self::AppendVec(av) => av.set_meta(meta),
} }
@ -164,7 +164,7 @@ impl<'a> StoredAccountMeta<'a> {
} }
} }
impl<'a> ReadableAccount for StoredAccountMeta<'a> { impl<'storage> ReadableAccount for StoredAccountMeta<'storage> {
fn lamports(&self) -> u64 { fn lamports(&self) -> u64 {
match self { match self {
Self::AppendVec(av) => av.lamports(), Self::AppendVec(av) => av.lamports(),