From 4fa5e4e2fe047b15591e56b8956c77571c65534c Mon Sep 17 00:00:00 2001
From: Ryo Onodera <ryoqun@gmail.com>
Date: Mon, 27 Apr 2020 12:06:53 +0900
Subject: [PATCH] Rebase cleanup

---
 runtime/src/accounts_db.rs | 7 +------
 runtime/src/bank.rs        | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index 90b7420c7052d3..5c7ba734fe886a 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -1122,12 +1122,7 @@ impl AccountsDB {
         collector
     }
 
-    pub fn range_scan_accounts<F, A, R>(
-        &self,
-        ancestors: &Ancestors,
-        range: R,
-        scan_func: F,
-    ) -> A
+    pub fn range_scan_accounts<F, A, R>(&self, ancestors: &Ancestors, range: R, scan_func: F) -> A
     where
         F: Fn(&mut A, Option<(&Pubkey, Account, Slot)>) -> (),
         A: Default,
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 7c77a788f28669..76fe414fbbfb46 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -2583,7 +2583,7 @@ mod tests {
     use super::*;
     use crate::{
         accounts_db::{get_temp_accounts_paths, tests::copy_append_vecs},
-        accounts_index::AncestorList,
+        accounts_index::Ancestors,
         genesis_utils::{
             create_genesis_config_with_leader, GenesisConfigInfo, BOOTSTRAP_VALIDATOR_LAMPORTS,
         },
@@ -3896,7 +3896,7 @@ mod tests {
     }
 
     impl Bank {
-        fn slots_by_pubkey(&self, pubkey: &Pubkey, ancestors: &AncestorList) -> Vec<Slot> {
+        fn slots_by_pubkey(&self, pubkey: &Pubkey, ancestors: &Ancestors) -> Vec<Slot> {
             let accounts_index = self.rc.accounts.accounts_db.accounts_index.read().unwrap();
             let (accounts, _) = accounts_index.get(&pubkey, &ancestors).unwrap();
             accounts