db: add feature flag, add rocksdb error type for DbError

alpenlabs · Aug 1, 2024 · 43f0f1f · 43f0f1f
1 parent bae4055
commit 43f0f1f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
@@ -14,3 +14,6 @@ borsh = { workspace = true }
 parking_lot = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
+
+[features]
+stubs = []
diff --git a/crates/db/src/errors.rs b/crates/db/src/errors.rs
@@ -33,9 +33,6 @@ pub enum DbError {
     #[error("tried to revert to index {0} above current tip {1}")]
     RevertAboveCurrent(u64, u64),
 
-    #[error("not yet implemented")]
-    Unimplemented,
-
     #[error("IO Error")]
     IoError,
 
@@ -57,6 +54,12 @@ pub enum DbError {
     #[error("transaction error {0}")]
     TransactionError(String),
 
+    #[error(" rocksdb {0}")]
+    RocksDb(String),
+
+    #[error("not yet implemented")]
+    Unimplemented,
+
     #[error("{0}")]
     Other(String),
 }

diff --git a/crates/db/src/lib.rs b/crates/db/src/lib.rs
@@ -2,8 +2,10 @@
 
 pub mod database;
 pub mod errors;
-pub mod stubs;
 pub mod traits;
 pub mod types;
 
+#[cfg(feature = "stubs")]
+pub mod stubs;
+
 pub type DbResult<T> = anyhow::Result<T, errors::DbError>;
diff --git a/crates/rocksdb-store/src/utils.rs b/crates/rocksdb-store/src/utils.rs
@@ -41,6 +41,6 @@ pub fn translate_rocksdb_error(err: rocksdb::Error) -> DbError {
         rocksdb::ErrorKind::TimedOut => DbError::TimedOut,
         rocksdb::ErrorKind::Aborted => DbError::Aborted,
         rocksdb::ErrorKind::Busy => DbError::Busy,
-        _ => DbError::Other(err.to_string()),
+        _ => DbError::RocksDb(err.to_string()),
     }
 }
diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml
@@ -4,7 +4,7 @@ name = "alpen-test-utils"
 version = "0.1.0"
 
 [dependencies]
-alpen-express-db = { workspace = true }
+alpen-express-db = { workspace = true, features = ["stubs"] }
 alpen-express-rocksdb = { workspace = true }
 
 anyhow = { workspace = true }