Update croaring (#3233)

.ci/install.yml

@@ -12,6 +12,6 @@ steps:
     condition: eq( variables['Agent.OS'], 'Darwin' )
   - script: |
       sudo apt-get update -yqq
-      sudo apt-get install -yqq --no-install-recommends libncursesw5-dev
+      sudo apt-get install -yqq --no-install-recommends libncursesw5-dev libclang-dev clang
     displayName: Linux Install Dependencies
     condition: eq( variables['Agent.OS'], 'Linux' )

chain/Cargo.toml

@@ -15,7 +15,7 @@ bitflags = "1"
 byteorder = "1"
 failure = "0.1"
 failure_derive = "0.1"
-croaring = "0.3.9"
+croaring = "0.4"
 log = "0.4"
 serde = "1"
 serde_derive = "1"

core/Cargo.toml

@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 blake2 = { package = "blake2-rfc", version = "0.2"}
 byteorder = "1"
-croaring = "0.3.9"
+croaring = "0.4"
 enum_primitive = "0.1"
 failure = "0.1"
 failure_derive = "0.1"

store/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 byteorder = "1"
-croaring = "0.3.9"
+croaring = "0.4"
 libc = "0.2"
 failure = "0.1"
 failure_derive = "0.1"

store/src/leaf_set.rs

@@ -114,7 +114,7 @@ impl LeafSet {
 
 		// First remove pos from leaf_set that were
 		// added after the point we are rewinding to.
-		let to_remove = ((cutoff_pos + 1) as u32)..bitmap.maximum();
+		let to_remove = ((cutoff_pos + 1) as u32)..bitmap.maximum().unwrap_or(0);
 		bitmap.remove_range_closed(to_remove);
 
 		// Then add back output pos to the leaf_set
@@ -133,7 +133,7 @@ impl LeafSet {
 	pub fn rewind(&mut self, cutoff_pos: u64, rewind_rm_pos: &Bitmap) {
 		// First remove pos from leaf_set that were
 		// added after the point we are rewinding to.
-		let to_remove = ((cutoff_pos + 1) as u32)..self.bitmap.maximum();
+		let to_remove = ((cutoff_pos + 1) as u32)..self.bitmap.maximum().unwrap_or(0);
 		self.bitmap.remove_range_closed(to_remove);
 
 		// Then add back output pos to the leaf_set

store/src/prune_list.rs

@@ -131,13 +131,13 @@ impl PruneList {
 	/// Return the total shift from all entries in the prune_list.
 	/// This is the shift we need to account for when adding new entries to our PMMR.
 	pub fn get_total_shift(&self) -> u64 {
-		self.get_shift(self.bitmap.maximum() as u64)
+		self.get_shift(self.bitmap.maximum().unwrap_or(0) as u64)
 	}
 
 	/// Return the total leaf_shift from all entries in the prune_list.
 	/// This is the leaf_shift we need to account for when adding new entries to our PMMR.
 	pub fn get_total_leaf_shift(&self) -> u64 {
-		self.get_leaf_shift(self.bitmap.maximum() as u64)
+		self.get_leaf_shift(self.bitmap.maximum().unwrap_or(0) as u64)
 	}
 
 	/// Computes by how many positions a node at pos should be shifted given the
@@ -276,9 +276,10 @@ impl PruneList {
 		if self.bitmap.is_empty() {
 			return;
 		}
-		self.pruned_cache = Bitmap::create_with_capacity(self.bitmap.maximum());
-		for pos in 1..=self.bitmap.maximum() {
-			let path = path(pos as u64, self.bitmap.maximum() as u64);
+		let maximum = self.bitmap.maximum().unwrap_or(0);
+		self.pruned_cache = Bitmap::create_with_capacity(maximum);
+		for pos in 1..(maximum + 1) {
+			let path = path(pos as u64, maximum as u64);
 			let pruned = path.into_iter().any(|x| self.bitmap.contains(x as u32));
 			if pruned {
 				self.pruned_cache.add(pos as u32)