refactor: clean up errors on wallet constructors

Author: thunderbiscuit

bdk-ffi/src/error.rs

@@ -1019,6 +1019,23 @@ impl From<BdkCreateWithPersistError<chain::rusqlite::Error>> for CreateWithPersi
     }
 }
 
+impl From<BdkCreateWithPersistError<PersistenceError>> for CreateWithPersistError {
+    fn from(error: BdkCreateWithPersistError<PersistenceError>) -> Self {
+        match error {
+            BdkCreateWithPersistError::Persist(e) => CreateWithPersistError::Persist {
+                error_message: e.to_string(),
+            },
+            BdkCreateWithPersistError::Descriptor(e) => CreateWithPersistError::Descriptor {
+                error_message: e.to_string(),
+            },
+            // Objects cannot currently be used in enumerations
+            BdkCreateWithPersistError::DataAlreadyExists(_e) => {
+                CreateWithPersistError::DataAlreadyExists
+            }
+        }
+    }
+}
+
 impl From<AddUtxoError> for CreateTxError {
     fn from(error: AddUtxoError) -> Self {
         match error {
@@ -1248,6 +1265,21 @@ impl From<BdkLoadWithPersistError<chain::rusqlite::Error>> for LoadWithPersistEr
     }
 }
 
+impl From<BdkLoadWithPersistError<PersistenceError>> for LoadWithPersistError {
+    fn from(error: BdkLoadWithPersistError<PersistenceError>) -> Self {
+        match error {
+            BdkLoadWithPersistError::Persist(e) => LoadWithPersistError::Persist {
+                error_message: e.to_string(),
+            },
+            BdkLoadWithPersistError::InvalidChangeSet(e) => {
+                LoadWithPersistError::InvalidChangeSet {
+                    error_message: e.to_string(),
+                }
+            }
+        }
+    }
+}
+
 impl From<BdkSqliteError> for PersistenceError {
     fn from(error: BdkSqliteError) -> Self {
         PersistenceError::Reason {

bdk-ffi/src/wallet.rs

@@ -58,9 +58,7 @@ impl Wallet {
                 .network(network)
                 .lookahead(lookahead)
                 .create_wallet(deref)
-                .map_err(|e| CreateWithPersistError::Persist {
-                    error_message: e.to_string(),
-                })?;
+                .map_err(CreateWithPersistError::from)?;
 
         Ok(Wallet {
             inner_mutex: Mutex::new(wallet),
@@ -100,9 +98,7 @@ impl Wallet {
             .network(network)
             .lookahead(lookahead)
             .create_wallet(deref)
-            .map_err(|e| CreateWithPersistError::Persist {
-                error_message: e.to_string(),
-            })?;
+            .map_err(CreateWithPersistError::from)?;
 
         Ok(Wallet {
             inner_mutex: Mutex::new(wallet),
@@ -134,9 +130,7 @@ impl Wallet {
                 .network(network)
                 .lookahead(lookahead)
                 .create_wallet(deref)
-                .map_err(|e| CreateWithPersistError::Persist {
-                    error_message: e.to_string(),
-                })?;
+                .map_err(CreateWithPersistError::from)?;
 
         Ok(Wallet {
             inner_mutex: Mutex::new(wallet),
@@ -164,9 +158,7 @@ impl Wallet {
             .lookahead(lookahead)
             .extract_keys()
             .load_wallet(deref)
-            .map_err(|e| LoadWithPersistError::Persist {
-                error_message: e.to_string(),
-            })?
+            .map_err(LoadWithPersistError::from)?
             .ok_or(LoadWithPersistError::CouldNotLoad)?;
 
         Ok(Wallet {