From 4e80dc028ef2eaa06df5994a37e10a60f091e6f0 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 14 May 2024 19:22:21 -0700
Subject: [PATCH] enable `unnecessary_wraps` lint

---
 Cargo.toml                          | 1 +
 src/database/abstraction/rocksdb.rs | 4 ++--
 src/database/abstraction/sqlite.rs  | 6 ++----
 src/utils.rs                        | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b24397b9..6b8e03d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -85,6 +85,7 @@ uninlined_format_args = "warn"
 unnecessary_safety_comment = "warn"
 unnecessary_safety_doc = "warn"
 unnecessary_self_imports = "warn"
+unnecessary_wraps = "warn"
 unneeded_field_pattern = "warn"
 unseparated_literal_suffix = "warn"
 verbose_file_reads = "warn"
diff --git a/src/database/abstraction/rocksdb.rs b/src/database/abstraction/rocksdb.rs
index 831e9bcd..e34c6c32 100644
--- a/src/database/abstraction/rocksdb.rs
+++ b/src/database/abstraction/rocksdb.rs
@@ -227,7 +227,7 @@ impl KvTree for RocksDbEngineTree<'_> {
         let lock = self.write_lock.write().unwrap();
 
         let old = self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?;
-        let new = utils::increment(old.as_deref()).unwrap();
+        let new = utils::increment(old.as_deref());
         self.db
             .rocks
             .put_cf_opt(&self.cf(), key, &new, &writeoptions)?;
@@ -244,7 +244,7 @@ impl KvTree for RocksDbEngineTree<'_> {
 
         for key in iter {
             let old = self.db.rocks.get_cf_opt(&self.cf(), &key, &readoptions)?;
-            let new = utils::increment(old.as_deref()).unwrap();
+            let new = utils::increment(old.as_deref());
             self.db
                 .rocks
                 .put_cf_opt(&self.cf(), key, new, &writeoptions)?;
diff --git a/src/database/abstraction/sqlite.rs b/src/database/abstraction/sqlite.rs
index 3105da22..a463cb61 100644
--- a/src/database/abstraction/sqlite.rs
+++ b/src/database/abstraction/sqlite.rs
@@ -237,8 +237,7 @@ impl KvTree for SqliteTable {
         guard.execute("BEGIN", [])?;
         for key in iter {
             let old = self.get_with_guard(&guard, &key)?;
-            let new = crate::utils::increment(old.as_deref())
-                .expect("utils::increment always returns Some");
+            let new = crate::utils::increment(old.as_deref());
             self.insert_with_guard(&guard, &key, &new)?;
         }
         guard.execute("COMMIT", [])?;
@@ -328,8 +327,7 @@ impl KvTree for SqliteTable {
 
         let old = self.get_with_guard(&guard, key)?;
 
-        let new =
-            crate::utils::increment(old.as_deref()).expect("utils::increment always returns Some");
+        let new = crate::utils::increment(old.as_deref());
 
         self.insert_with_guard(&guard, key, &new)?;
 
diff --git a/src/utils.rs b/src/utils.rs
index 1ff95576..a335e29c 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -21,7 +21,7 @@ pub(crate) fn millis_since_unix_epoch() -> u64 {
 }
 
 #[cfg(any(feature = "rocksdb", feature = "sqlite"))]
-pub(crate) fn increment(old: Option<&[u8]>) -> Option<Vec<u8>> {
+pub(crate) fn increment(old: Option<&[u8]>) -> Vec<u8> {
     let number = match old.map(TryInto::try_into) {
         Some(Ok(bytes)) => {
             let number = u64::from_be_bytes(bytes);
@@ -30,7 +30,7 @@ pub(crate) fn increment(old: Option<&[u8]>) -> Option<Vec<u8>> {
         _ => 1, // Start at one. since 0 should return the first event in the db
     };
 
-    Some(number.to_be_bytes().to_vec())
+    number.to_be_bytes().to_vec()
 }
 
 pub(crate) fn generate_keypair() -> Vec<u8> {