Update rust-rocksdb to v0.21

And drop support for the `oldcpu` feature, which required an outdated rocksdb release (v0.12.4, released over 4 years ago)
Blockstream · Feb 13, 2024 · aabc363 · aabc363
1 parent 6668bdd
commit aabc363
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,10 +12,8 @@ readme = "README.md"
 edition = "2018"
 
 [features]
-default = [ "rocksdb" ]
 liquid = [ "elements" ]
 electrum-discovery = [ "electrum-client"]
-oldcpu = [ "rocksdb-oldcpu" ]
 
 [dependencies]
 arraydeque = "0.5.1"
@@ -39,8 +37,7 @@ num_cpus = "1.12.0"
 page_size = "0.6.0"
 prometheus = "0.13"
 rayon = "1.5.0"
-rocksdb = { version = "0.17.0", optional = true }
-rocksdb-oldcpu = { version = "0.12.4", optional = true, package = "rocksdb" }
+rocksdb = "0.21"
 rust-crypto = "0.2"
 serde = "1.0.118"
 serde_derive = "1.0.118"

diff --git a/src/new_index/db.rs b/src/new_index/db.rs
@@ -26,7 +26,7 @@ impl<'a> Iterator for ScanIterator<'a> {
         if self.done {
             return None;
         }
-        let (key, value) = self.iter.next()?;
+        let (key, value) = self.iter.next()?.expect("valid iterator");
         if !key.starts_with(&self.prefix) {
             self.done = true;
             return None;