AcctIdx: minor code cleanup (#21547)

This commit is contained in:
Jeff Washington (jwash) 2021-12-02 11:05:54 -06:00 committed by GitHub
parent 6bb884836c
commit 8dfa83c579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions

View File

@ -1213,10 +1213,8 @@ impl<T: IndexValue> AccountsIndex<T> {
if let AccountIndexGetResult::Found(list_r, index) =
self.get(&pubkey, Some(ancestors), max_root)
{
func(
&pubkey,
(&list_r.slot_list()[index].1, list_r.slot_list()[index].0),
);
let entry = &list_r.slot_list()[index];
func(&pubkey, (&entry.1, entry.0));
}
if config.is_aborted() {
break;

View File

@ -156,7 +156,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
fn get_only_in_mem<RT>(
&self,
pubkey: &K,
callback: impl for<'a> FnOnce(Option<&'a Arc<AccountMapEntryInner<T>>>) -> RT,
callback: impl for<'a> FnOnce(Option<&'a AccountMapEntry<T>>) -> RT,
) -> RT {
let m = Measure::start("get");
let map = self.map().read().unwrap();
@ -190,7 +190,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
&self,
pubkey: &K,
// return true if item should be added to in_mem cache
callback: impl for<'a> FnOnce(Option<&Arc<AccountMapEntryInner<T>>>) -> (bool, RT),
callback: impl for<'a> FnOnce(Option<&AccountMapEntry<T>>) -> (bool, RT),
) -> RT {
self.get_only_in_mem(pubkey, |entry| {
if let Some(entry) = entry {