Skip to content

Commit 26d7e8b

Browse files
committed
refactor: add redb::DatabaseError to BDKCliError
This makes the error handling cleaner.
1 parent 3e03869 commit 26d7e8b

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

src/error.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,13 @@ pub enum BDKCliError {
6262
RusqliteError(#[from] bdk_wallet::rusqlite::Error),
6363

6464
#[cfg(feature = "redb")]
65-
#[error("RedbStore error: {0}")]
65+
#[error("Redb StoreError: {0}")]
6666
RedbStoreError(#[from] bdk_redb::error::StoreError),
6767

68+
#[cfg(feature = "redb")]
69+
#[error("Redb dabtabase error: {0}")]
70+
RedbDatabaseError(#[from] bdk_redb::redb::DatabaseError),
71+
6872
#[error("Serde json error: {0}")]
6973
SerdeJson(#[from] serde_json::Error),
7074

src/handlers.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -770,10 +770,9 @@ pub(crate) async fn handle_command(cli_opts: CliOpts) -> Result<String, Error> {
770770
}
771771
#[cfg(feature = "redb")]
772772
DatabaseType::Redb => {
773-
let db = Arc::new(
774-
bdk_redb::redb::Database::create(home_dir.join("wallet.redb"))
775-
.map_err(bdk_redb::error::StoreError::from)?,
776-
);
773+
let db = Arc::new(bdk_redb::redb::Database::create(
774+
home_dir.join("wallet.redb"),
775+
)?);
777776
let store = RedbStore::new(
778777
db,
779778
wallet_name.as_deref().unwrap_or("wallet").to_string(),
@@ -827,10 +826,9 @@ pub(crate) async fn handle_command(cli_opts: CliOpts) -> Result<String, Error> {
827826
}
828827
#[cfg(feature = "redb")]
829828
DatabaseType::Redb => {
830-
let db = Arc::new(
831-
bdk_redb::redb::Database::create(home_dir.join("wallet.redb"))
832-
.map_err(bdk_redb::error::StoreError::from)?,
833-
);
829+
let db = Arc::new(bdk_redb::redb::Database::create(
830+
home_dir.join("wallet.redb"),
831+
)?);
834832
let store = RedbStore::new(
835833
db,
836834
wallet_name.as_deref().unwrap_or("wallet").to_string(),
@@ -890,10 +888,9 @@ pub(crate) async fn handle_command(cli_opts: CliOpts) -> Result<String, Error> {
890888
}
891889
#[cfg(feature = "redb")]
892890
DatabaseType::Redb => {
893-
let db = Arc::new(
894-
bdk_redb::redb::Database::create(home_dir.join("wallet.redb"))
895-
.map_err(bdk_redb::error::StoreError::from)?,
896-
);
891+
let db = Arc::new(bdk_redb::redb::Database::create(
892+
home_dir.join("wallet.redb"),
893+
)?);
897894
let store = RedbStore::new(
898895
db,
899896
wallet_name.as_deref().unwrap_or("wallet").to_string(),

0 commit comments

Comments
 (0)