Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Get rid of pending state
  • Loading branch information
arkpar committed Sep 9, 2022
commit 6f46e7dd4969472745d3d15c45ca5751349ef5ab
21 changes: 0 additions & 21 deletions client/state-db/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -496,27 +496,6 @@ impl<BlockHash: Hash + MallocSizeOf, Key: Hash + MallocSizeOf, D: MetaDb>
db.get(key.as_ref()).map_err(Error::Db)
}

fn apply_pending(&mut self) {
self.non_canonical.apply_pending();
if let Some(pruning) = &mut self.pruning {
pruning.apply_pending();
}
let next_hash = self.pruning.as_mut().map(|p| p.next_hash());
trace!(
target: "forks",
"First available: {:?} ({}), Last canon: {:?} ({}), Best forks: {:?}",
next_hash,
self.pruning.as_ref().map(|p| p.pending()).unwrap_or(0),
self.non_canonical.last_canonicalized_hash(),
self.non_canonical.last_canonicalized_block_number().unwrap_or(0),
self.non_canonical.top_level(),
);
}

fn revert_pending(&mut self) {
self.non_canonical.revert_pending();
}

fn memory_info(&self) -> StateDbMemoryInfo {
StateDbMemoryInfo {
non_canonical: MemorySize::from_bytes(malloc_size(&self.non_canonical)),
Expand Down
Loading