Revert "Revert "Disable accounts squash call from bank""

This reverts commit f84593ad5f.
This commit is contained in:
Pankaj Garg
2019-04-02 23:27:18 +00:00
committed by Grimes
parent 0f9c516570
commit cfe91c67f9
2 changed files with 5 additions and 1 deletions

View File

@@ -727,6 +727,7 @@ impl AccountsDB {
.map_or(0, |fork_info| fork_info.transaction_count)
}
#[allow(dead_code)]
fn remove_parents(&self, fork: Fork) -> Vec<Fork> {
let mut info = self.fork_infos.write().unwrap();
let fork_info = info.get_mut(&fork).unwrap();
@@ -743,6 +744,7 @@ impl AccountsDB {
.is_empty()
}
#[allow(dead_code)]
fn get_merged_account_map(
&self,
fork: Fork,
@@ -763,6 +765,7 @@ 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);
@@ -991,6 +994,7 @@ 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);

View File

@@ -301,7 +301,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()