From f84593ad5f2eb73d9b49e2732bc6b4fb053192cb Mon Sep 17 00:00:00 2001 From: Pankaj Garg Date: Mon, 25 Mar 2019 17:53:27 +0000 Subject: [PATCH] Revert "Disable accounts squash call from bank" This reverts commit 7685ba2805a9e737abeaf42ac2a7da514e812bc3. --- runtime/src/accounts.rs | 4 ---- runtime/src/bank.rs | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs index 64a631b7e1..7cd688eeb4 100644 --- a/runtime/src/accounts.rs +++ b/runtime/src/accounts.rs @@ -727,7 +727,6 @@ impl AccountsDB { .map_or(0, |fork_info| fork_info.transaction_count) } - #[allow(dead_code)] fn remove_parents(&self, fork: Fork) -> Vec { let mut info = self.fork_infos.write().unwrap(); let fork_info = info.get_mut(&fork).unwrap(); @@ -744,7 +743,6 @@ impl AccountsDB { .is_empty() } - #[allow(dead_code)] fn get_merged_account_map( &self, fork: Fork, @@ -765,7 +763,6 @@ impl AccountsDB { } /// make fork a root, i.e. forget its heritage - #[allow(dead_code)] fn squash(&self, fork: Fork) { let parents = self.remove_parents(fork); @@ -994,7 +991,6 @@ impl Accounts { /// accounts starts with an empty data structure for every child/fork /// this function squashes all the parents into this instance - #[allow(dead_code)] pub fn squash(&self, fork: Fork) { assert!(!self.account_locks.lock().unwrap().contains_key(&fork)); self.accounts_db.squash(fork); diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index ab8f9e280d..22fd701018 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -300,7 +300,7 @@ impl Bank { let parents = self.parents(); *self.parent.write().unwrap() = None; - // self.accounts().squash(self.accounts_id); + self.accounts().squash(self.accounts_id); let parent_caches: Vec<_> = parents .iter()