From 3a172e05acdfa89a0c74b40c4567603003bb52ee Mon Sep 17 00:00:00 2001 From: "hinto.janai" Date: Thu, 25 Apr 2024 20:29:05 -0400 Subject: [PATCH] small fixes --- database/Cargo.toml | 5 +- database/src/service/constants.rs | 86 ------------------------------- database/src/service/read.rs | 6 --- database/src/service/write.rs | 1 - 4 files changed, 2 insertions(+), 96 deletions(-) delete mode 100644 database/src/service/constants.rs diff --git a/database/Cargo.toml b/database/Cargo.toml index 443498a6..fea87e0a 100644 --- a/database/Cargo.toml +++ b/database/Cargo.toml @@ -44,9 +44,8 @@ thread_local = { workspace = true } rayon = { workspace = true, optional = true } # Optional features. -# SAFETY: Do not remove the `read-txn-no-tls` feature. -# Required for `heed`'s read transaction to be `Send`. -# See for more info. +# SAFETY: Do not remove the `read-txn-no-tls` feature, +# required for `heed`'s read transaction to be `Send`. heed = { version = "0.20.0-alpha.9", features = ["read-txn-no-tls"], optional = true } redb = { version = "2.0.0", optional = true } serde = { workspace = true, optional = true } diff --git a/database/src/service/constants.rs b/database/src/service/constants.rs deleted file mode 100644 index a5d810dc..00000000 --- a/database/src/service/constants.rs +++ /dev/null @@ -1,86 +0,0 @@ -//! General constants used throughout `cuprate-database`. - -//---------------------------------------------------------------------------------------------------- Import -use cfg_if::cfg_if; - -//---------------------------------------------------------------------------------------------------- Version -/// Current major version of the database. -/// -/// Returned by [`crate::ops::property::db_version`]. -/// -/// This is incremented by 1 when `cuprate_database`'s -/// structure/schema/tables change. -/// -/// This is akin to `VERSION` in `monerod`: -/// -pub const DATABASE_VERSION: u64 = 0; - -//---------------------------------------------------------------------------------------------------- Error Messages -/// Corrupt database error message. -/// -/// The error message shown to end-users in panic -/// messages if we think the database is corrupted. -/// -/// This is meant to be user-friendly. -pub const DATABASE_CORRUPT_MSG: &str = r"Cuprate has encountered a fatal error. The database may be corrupted. - -TODO: instructions on: -1. What to do -2. How to fix (re-sync, recover, etc) -3. General advice for preventing corruption -4. etc"; - -//---------------------------------------------------------------------------------------------------- Misc -/// Static string of the `crate` being used as the database backend. -/// -/// | Backend | Value | -/// |---------|-------| -/// | `heed` | "heed" -/// | `redb` | "redb" -pub const DATABASE_BACKEND: &str = { - cfg_if! { - if #[cfg(all(feature = "redb", not(feature = "heed")))] { - "redb" - } else { - "heed" - } - } -}; - -/// Cuprate's database filename. -/// -/// Used in [`Config::db_file`](crate::config::Config::db_file). -/// -/// | Backend | Value | -/// |---------|-------| -/// | `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" - } - } -}; - -/// 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") - } - } -}; - -//---------------------------------------------------------------------------------------------------- Tests -#[cfg(test)] -mod test {} diff --git a/database/src/service/read.rs b/database/src/service/read.rs index 57671db8..13c12f00 100644 --- a/database/src/service/read.rs +++ b/database/src/service/read.rs @@ -1,10 +1,5 @@ //! Database reader thread-pool definitions and logic. -// `EnvInner` is a RwLock for `heed`. -// Clippy thinks it should be dropped earlier but it -// needs to be open until most functions return. -#![allow(clippy::significant_drop_tightening)] - //---------------------------------------------------------------------------------------------------- Import use std::{ collections::{HashMap, HashSet}, @@ -476,7 +471,6 @@ fn number_outputs_with_amount(env: &ConcreteEnv, amounts: Vec) -> Respon // INVARIANT: #[cfg] @ lib.rs asserts `usize == u64` #[allow(clippy::cast_possible_truncation)] Ok(count) => Ok((amount, count as usize)), - Err(RuntimeError::KeyNotFound) => Ok((amount, 0)), Err(e) => Err(e), } }) diff --git a/database/src/service/write.rs b/database/src/service/write.rs index cacc3796..4d8f895a 100644 --- a/database/src/service/write.rs +++ b/database/src/service/write.rs @@ -228,7 +228,6 @@ impl DatabaseWriter { /// [`WriteRequest::WriteBlock`]. #[inline] -#[allow(clippy::significant_drop_tightening)] fn write_block(env: &ConcreteEnv, block: &VerifiedBlockInformation) -> ResponseResult { let env_inner = env.env_inner(); let tx_rw = env_inner.tx_rw()?;