Further simplify the functions

anza-xyz · Mar 22, 2024 · 732964a · 732964a
1 parent 79e949f
commit 732964a
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/accounts-db/src/accounts_file.rs b/accounts-db/src/accounts_file.rs
@@ -157,7 +157,7 @@ impl AccountsFile {
             Self::TieredStorage(ts) => ts
                 .reader()?
                 .get_account(IndexOffset(index as u32))
-                .unwrap_or(None)
+                .ok()?
                 .map(|(metas, index_offset)| (metas, index_offset.0 as usize)),
         }
     }
@@ -197,11 +197,7 @@ impl AccountsFile {
             Self::AppendVec(av) => av.accounts(offset),
             Self::TieredStorage(ts) => ts
                 .reader()
-                .map(|reader| {
-                    reader
-                        .accounts(IndexOffset(offset as u32))
-                        .unwrap_or_default()
-                })
+                .and_then(|reader| reader.accounts(IndexOffset(offset as u32)).ok())
                 .unwrap_or_default(),
         }
     }