feat: add sqlite error

bitcoindevkit · Jun 4, 2024 · b78dd95 · b78dd95
1 parent 19b4e11
commit b78dd95
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl
@@ -236,6 +236,12 @@ interface SignerError {
     External(string error_message);
 };
 
+[Error]
+interface SqliteError {
+  Network(Network expected, Network given);
+  Sqlite(string rusqlite_error);
+};
+
 [Error]
 interface TransactionError {
   Io();

diff --git a/bdk-ffi/src/error.rs b/bdk-ffi/src/error.rs
@@ -2,7 +2,7 @@ use crate::bitcoin::OutPoint;
 
 use bdk_electrum::electrum_client::Error as BdkElectrumError;
 use bdk_esplora::esplora_client::{Error as BdkEsploraError, Error};
-use bdk_sqlite::rusqlite::Error as BdkSqliteError;
+use bdk_sqlite::rusqlite::Error as BdkRusqliteError;
 use bdk_wallet::bitcoin::address::Error as BdkAddressError;
 use bdk_wallet::bitcoin::address::ParseError;
 use bdk_wallet::bitcoin::amount::ParseAmountError as BdkParseAmountError;
@@ -575,6 +575,15 @@ pub enum SignerError {
     External { error_message: String },
 }
 
+#[derive(Debug, thiserror::Error)]
+pub enum SqliteError {
+    #[error("invalid network, cannot change the one already stored in the database")]
+    Network { expected: Network, given: Network },
+
+    #[error("SQLite error: {rusqlite_error}")]
+    Sqlite { rusqlite_error: String },
+}
+
 #[derive(Debug, thiserror::Error)]
 pub enum TransactionError {
     #[error("io error")]
@@ -1211,21 +1220,8 @@ impl From<BdkEncodeError> for TransactionError {
     }
 }
 
-// impl From<BdkFileError> for WalletCreationError {
-//     fn from(error: BdkFileError) -> Self {
-//         match error {
-//             BdkFileError::Io(e) => WalletCreationError::Io {
-//                 error_message: e.to_string(),
-//             },
-//             BdkFileError::InvalidMagicBytes { got, expected } => {
-//                 WalletCreationError::InvalidMagicBytes { got, expected }
-//             }
-//         }
-//     }
-// }
-
-impl From<BdkSqliteError> for WalletCreationError {
-    fn from(error: BdkSqliteError) -> Self {
+impl From<BdkRusqliteError> for WalletCreationError {
+    fn from(error: BdkRusqliteError) -> Self {
         WalletCreationError::Sqlite {
             error_message: error.to_string(),
         }

diff --git a/bdk-ffi/src/lib.rs b/bdk-ffi/src/lib.rs
@@ -36,6 +36,7 @@ use crate::error::PersistenceError;
 use crate::error::PsbtError;
 use crate::error::PsbtParseError;
 use crate::error::SignerError;
+use crate::error::SqliteError;
 use crate::error::TransactionError;
 use crate::error::TxidParseError;
 use crate::error::WalletCreationError;