Merge pull request #1159 from MutinyWallet/fedimint-errors

Better convert fedimint errors
MutinyWallet · Apr 26, 2024 · 285fc6d · 285fc6d
2 parents 2380835 + c4041d4
commit 285fc6d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/mutiny-core/src/error.rs b/mutiny-core/src/error.rs
@@ -8,6 +8,7 @@ use lightning::ln::peer_handler::PeerHandleError;
 use lightning_invoice::ParseOrSemanticError;
 use lightning_rapid_gossip_sync::GraphSyncError;
 use lightning_transaction_sync::TxSyncError;
+use log::error;
 use nostr::nips::nip05;
 use std::string::FromUtf8Error;
 use thiserror::Error;
@@ -179,7 +180,7 @@ pub enum MutinyError {
     #[error("Failed to connect to a federation.")]
     FederationConnectionFailed,
     #[error(transparent)]
-    Other(#[from] anyhow::Error),
+    Other(anyhow::Error),
 }
 
 #[derive(Error, Debug)]
@@ -585,3 +586,15 @@ impl From<payjoin::send::ResponseError> for MutinyError {
         Self::PayjoinResponse(e)
     }
 }
+
+impl From<anyhow::Error> for MutinyError {
+    fn from(e: anyhow::Error) -> Self {
+        error!("Got unhandled error: {e}");
+        // handle fedimint anyhow errors
+        match e.to_string().as_str() {
+            "Insufficient balance" => Self::InsufficientBalance,
+            "MissingInvoiceAmount" => Self::BadAmountError,
+            _ => Self::Other(e),
+        }
+    }
+}
diff --git a/mutiny-wasm/src/error.rs b/mutiny-wasm/src/error.rs
@@ -228,15 +228,7 @@ impl From<MutinyError> for MutinyJsError {
             MutinyError::TokenAlreadySpent => MutinyJsError::TokenAlreadySpent,
             MutinyError::FederationRequired => MutinyJsError::FederationRequired,
             MutinyError::FederationConnectionFailed => MutinyJsError::FederationConnectionFailed,
-            MutinyError::Other(e) => {
-                error!("Got unhandled error: {e}");
-                // FIXME: For some unknown reason, InsufficientBalance is being returned as `Other`
-                if e.to_string().starts_with("Insufficient balance") {
-                    MutinyJsError::InsufficientBalance
-                } else {
-                    MutinyJsError::UnknownError
-                }
-            }
+            MutinyError::Other(_) => MutinyJsError::UnknownError,
             MutinyError::SubscriptionClientNotConfigured => {
                 MutinyJsError::SubscriptionClientNotConfigured
             }