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

add `for<>` to callback on get fns (#838)

This commit is contained in:
Jeff Washington (jwash) 2024-04-16 14:55:50 -05:00 committed by GitHub
parent 0976e9b222
commit a9548a6dc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts-db/src/account_storage/meta.rs
View File

@ -82,7 +82,7 @@ impl<'a: 'b, 'b, U: StorableAccounts<'a>, V: Borrow<AccountHash>>
pub fn account<Ret>(
&self,
index: usize,
callback: impl FnMut(AccountForStorage<'a>) -> Ret,
callback: impl for<'c> FnMut(AccountForStorage<'c>) -> Ret,
) -> Ret {
self.accounts
.account_default_if_zero_lamport(index, callback)

2
accounts-db/src/accounts_db.rs
View File

@ -9634,7 +9634,7 @@ pub mod tests {
fn account<Ret>(
&self,
index: usize,
mut callback: impl FnMut(AccountForStorage<'a>) -> Ret,
mut callback: impl for<'b> FnMut(AccountForStorage<'b>) -> Ret,
) -> Ret {
callback(self.1[index].1.into())
}

2
accounts-db/src/stake_rewards.rs
View File

@ -25,7 +25,7 @@ impl<'a> StorableAccounts<'a> for (Slot, &'a [StakeReward]) {
fn account<Ret>(
&self,
index: usize,
mut callback: impl FnMut(AccountForStorage<'a>) -> Ret,
mut callback: impl for<'b> FnMut(AccountForStorage<'b>) -> Ret,
) -> Ret {
let entry = &self.1[index];
callback((&self.1[index].stake_pubkey, &entry.stake_account).into())

21
accounts-db/src/storable_accounts.rs
View File

@ -97,13 +97,16 @@ lazy_static! {
/// All legacy callers do not have a unique slot per account to store.
pub trait StorableAccounts<'a>: Sync {
/// account at 'index'
fn account<Ret>(&self, index: usize, callback: impl FnMut(AccountForStorage<'a>) -> Ret)
-> Ret;
fn account<Ret>(
&self,
index: usize,
callback: impl for<'b> FnMut(AccountForStorage<'b>) -> Ret,
) -> Ret;
/// None if account is zero lamports
fn account_default_if_zero_lamport<Ret>(
&self,
index: usize,
mut callback: impl FnMut(AccountForStorage<'a>) -> Ret,
mut callback: impl for<'b> FnMut(AccountForStorage<'b>) -> Ret,
) -> Ret {
self.account(index, |account| {
callback(if account.lamports() != 0 {
@ -166,7 +169,7 @@ where
fn account<Ret>(
&self,
index: usize,
mut callback: impl FnMut(AccountForStorage<'a>) -> Ret,
mut callback: impl for<'b> FnMut(AccountForStorage<'b>) -> Ret,
) -> Ret {
callback((self.accounts[index].0, self.accounts[index].1).into())
}
@ -190,7 +193,7 @@ where
fn account<Ret>(
&self,
index: usize,
mut callback: impl FnMut(AccountForStorage<'a>) -> Ret,
mut callback: impl for<'c> FnMut(AccountForStorage<'c>) -> Ret,
) -> Ret {
callback((self.1[index].0, self.1[index].1).into())
}
@ -212,7 +215,7 @@ where
fn account<Ret>(
&self,
index: usize,
mut callback: impl FnMut(AccountForStorage<'a>) -> Ret,
mut callback: impl for<'b> FnMut(AccountForStorage<'b>) -> Ret,
) -> Ret {
callback((&self.1[index].0, &self.1[index].1).into())
}
@ -232,7 +235,7 @@ impl<'a> StorableAccounts<'a> for (Slot, &'a [&'a StoredAccountMeta<'a>]) {
fn account<Ret>(
&self,
index: usize,
mut callback: impl FnMut(AccountForStorage<'a>) -> Ret,
mut callback: impl for<'b> FnMut(AccountForStorage<'b>) -> Ret,
) -> Ret {
callback(self.1[index].into())
}
@ -321,7 +324,7 @@ impl<'a> StorableAccounts<'a> for StorableAccountsBySlot<'a> {
fn account<Ret>(
&self,
index: usize,
mut callback: impl FnMut(AccountForStorage<'a>) -> Ret,
mut callback: impl for<'b> FnMut(AccountForStorage<'b>) -> Ret,
) -> Ret {
let indexes = self.find_internal_index(index);
callback(self.slots_and_accounts[indexes.0].1[indexes.1].into())
@ -354,7 +357,7 @@ impl<'a> StorableAccounts<'a> for (Slot, &'a [&'a StoredAccountMeta<'a>], Slot)
fn account<Ret>(
&self,
index: usize,
mut callback: impl FnMut(AccountForStorage<'a>) -> Ret,
mut callback: impl for<'b> FnMut(AccountForStorage<'b>) -> Ret,
) -> Ret {
callback(self.1[index].into())
}