storage: database hotswap

storage/blockchain/Cargo.toml

@@ -9,12 +9,12 @@ repository  = "https://github.com/Cuprate/cuprate/tree/main/storage/cuprate-bloc
 keywords    = ["cuprate", "blockchain", "database"]
 
 [features]
-default     = ["heed"]
+default     = []
 # default     = ["redb", "service"]
 # default     = ["redb-memory", "service"]
-heed        = ["cuprate-database/heed"]
-redb        = ["cuprate-database/redb"]
-redb-memory = ["cuprate-database/redb-memory"]
+# heed        = ["cuprate-database/heed"]
+# redb        = ["cuprate-database/redb"]
+# redb-memory = ["cuprate-database/redb-memory"]
 serde       = ["dep:serde", "cuprate-database/serde", "cuprate-database-service/serde", "cuprate-helper/serde"]
 
 [dependencies]

storage/database/Cargo.toml

@@ -9,12 +9,10 @@ repository  = "https://github.com/Cuprate/cuprate/tree/main/storage/database"
 keywords    = ["cuprate", "database"]
 
 [features]
-default     = ["heed"]
+default     = []
 # default     = ["redb"]
 # default     = ["redb-memory"]
-heed        = []
-redb        = ["dep:redb"]
-redb-memory = ["redb"]
+# heed        = []
 
 [dependencies]
 bytemuck  = { version = "1.18.0", features = ["must_cast", "derive", "min_const_generics", "extern_crate_alloc"] }
@@ -26,8 +24,8 @@ thiserror = { workspace = true }
 tracing   = { workspace = true }
 
 # Optional features.
-heed  = { version = "0.20.5", features = ["read-txn-no-tls"] }
-redb  = { version = "2.1.3", optional = true }
+# heed  = { version = "0.20.5", features = ["read-txn-no-tls"] }
+redb  = { version = "2.1.3" }
 serde = { workspace = true, optional = true }
 
 [dev-dependencies]

storage/database/src/backend/mod.rs

@@ -1,18 +1,7 @@
 //! Database backends.
 
-cfg_if::cfg_if! {
-    // If both backends are enabled, fallback to `heed`.
-    // This is useful when using `--all-features`.
-    if #[cfg(all(feature = "redb", not(feature = "heed")))] {
-        use heed as _;
-
-        mod redb;
-        pub use redb::ConcreteEnv;
-    } else {
-        mod heed;
-        pub use heed::ConcreteEnv;
-    }
-}
+mod redb;
+pub use redb::ConcreteEnv;
 
 #[cfg(test)]
 mod tests;

storage/database/src/constants.rs

@@ -27,15 +27,7 @@ If this happens frequently, consider using the `Safe` sync mode.";
 /// |---------|-------|
 /// | `heed`  | `"heed"`
 /// | `redb`  | `"redb"`
-pub const DATABASE_BACKEND: &str = {
-    cfg_if! {
-        if #[cfg(all(feature = "redb", not(feature = "heed")))] {
-            "redb"
-        } else {
-            "heed"
-        }
-    }
-};
+pub const DATABASE_BACKEND: &str = "redb";
 
 /// Cuprate's database filename.
 ///
@@ -45,31 +37,15 @@ pub const DATABASE_BACKEND: &str = {
 /// |---------|-------|
 /// | `heed`  | `"data.mdb"`
 /// | `redb`  | `"data.redb"`
-pub const DATABASE_DATA_FILENAME: &str = {
-    cfg_if! {
-        if #[cfg(all(feature = "redb", not(feature = "heed")))] {
-            "data.redb"
-        } else {
-            "data.mdb"
-        }
-    }
-};
+pub const DATABASE_DATA_FILENAME: &str = "data.redb";
 
 /// Cuprate's database lock filename.
 ///
 /// | Backend | Value |
 /// |---------|-------|
 /// | `heed`  | `Some("lock.mdb")`
 /// | `redb`  | `None` (redb doesn't use a file lock)
-pub const DATABASE_LOCK_FILENAME: Option<&str> = {
-    cfg_if! {
-        if #[cfg(all(feature = "redb", not(feature = "heed")))] {
-            None
-        } else {
-            Some("lock.mdb")
-        }
-    }
-};
+pub const DATABASE_LOCK_FILENAME: Option<&str> = None;
 
 //---------------------------------------------------------------------------------------------------- Tests
 #[cfg(test)]

storage/database/src/lib.rs

@@ -63,13 +63,3 @@ pub(crate) mod tests;
 // Used inside public facing macros.
 #[doc(hidden)]
 pub use paste;
-
-//----------------------------------------------------------------------------------------------------
-// HACK: needed to satisfy the `unused_crate_dependencies` lint.
-cfg_if::cfg_if! {
-    if #[cfg(feature = "redb")]  {
-        use redb as _;
-    } else {
-        use heed as _;
-    }
-}

storage/service/Cargo.toml

@@ -9,10 +9,10 @@ repository  = "https://github.com/Cuprate/cuprate/tree/main/storage/service"
 keywords    = ["cuprate", "service", "database"]
 
 [features]
-default     = ["heed"]
-heed        = ["cuprate-database/heed"]
-redb        = ["cuprate-database/redb"]
-redb-memory = ["cuprate-database/redb-memory"]
+default     = []
+# heed        = ["cuprate-database/heed"]
+# redb        = ["cuprate-database/redb"]
+# redb-memory = ["cuprate-database/redb-memory"]
 
 [dependencies]
 cuprate-database = { workspace = true }

storage/txpool/Cargo.toml

@@ -9,16 +9,16 @@ repository  = "https://github.com/Cuprate/cuprate/tree/main/storage/txpool"
 keywords    = ["cuprate", "txpool", "transaction", "pool", "database"]
 
 [features]
-default     = ["heed"]
+default     = []
 # default   = ["redb", "service"]
 # default   = ["redb-memory", "service"]
-heed        = ["cuprate-database/heed"]
-redb        = ["cuprate-database/redb"]
-redb-memory = ["cuprate-database/redb-memory"]
+# heed        = ["cuprate-database/heed"]
+# redb        = ["cuprate-database/redb"]
+# redb-memory = ["cuprate-database/redb-memory"]
 serde       = ["dep:serde", "cuprate-database/serde", "cuprate-database-service/serde", "cuprate-helper/serde"]
 
 [dependencies]
-cuprate-database         = { workspace = true, features = ["heed"] }
+cuprate-database         = { workspace = true }
 cuprate-database-service = { workspace = true }
 cuprate-types            = { workspace = true, features = ["rpc"] }
 cuprate-helper           = { workspace = true, default-features = false, features = ["constants"] }