Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

use remove_range_closed for clarity (#3088)

Browse source
This commit is contained in:
Antioch Peverell 2019-10-07 21:01:44 +01:00 committed by GitHub
parent 94b351beac
commit 39016faf52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
store/src/leaf_set.rs
View file

@ -115,10 +115,8 @@ impl LeafSet {
// First remove pos from leaf_set that were // First remove pos from leaf_set that were
// added after the point we are rewinding to. // added after the point we are rewinding to.
let marker_from = cutoff_pos; let to_remove = ((cutoff_pos + 1) as u32)..bitmap.maximum();
let marker_to = self.bitmap.maximum() as u64; bitmap.remove_range_closed(to_remove);
let rewind_add_pos: Bitmap = ((marker_from + 1)..=marker_to).map(|x| x as u32).collect();
bitmap.andnot_inplace(&rewind_add_pos);
// Then add back output pos to the leaf_set // Then add back output pos to the leaf_set
// that were removed. // that were removed.
@ -136,10 +134,8 @@ impl LeafSet {
pub fn rewind(&mut self, cutoff_pos: u64, rewind_rm_pos: &Bitmap) { pub fn rewind(&mut self, cutoff_pos: u64, rewind_rm_pos: &Bitmap) {
// First remove pos from leaf_set that were // First remove pos from leaf_set that were
// added after the point we are rewinding to. // added after the point we are rewinding to.
let marker_from = cutoff_pos; let to_remove = ((cutoff_pos + 1) as u32)..self.bitmap.maximum();
let marker_to = self.bitmap.maximum() as u64; self.bitmap.remove_range_closed(to_remove);
let rewind_add_pos: Bitmap = ((marker_from + 1)..=marker_to).map(|x| x as u32).collect();
self.bitmap.andnot_inplace(&rewind_add_pos);
// Then add back output pos to the leaf_set // Then add back output pos to the leaf_set
// that were removed. // that were removed.