chore: rename error to detail in error-response

ngutech21 · Dec 6, 2023 · e3c9475 · e3c9475
1 parent b9320a7
commit e3c9475
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/flutter/native/src/wasm_client.rs b/flutter/native/src/wasm_client.rs
@@ -136,11 +136,11 @@ async fn extract_response_data<T: serde::de::DeserializeOwned>(
                         .unwrap();
 
                     // FIXME: use the error code to return a proper error
-                    match data.error.as_str() {
+                    match data.detail.as_str() {
                         "Lightning invoice not paid yet." => {
-                            Err(MokshaWalletError::InvoiceNotPaidYet(data.code, data.error))
+                            Err(MokshaWalletError::InvoiceNotPaidYet(data.code, data.detail))
                         }
-                        _ => Err(MokshaWalletError::MintError(data.error)),
+                        _ => Err(MokshaWalletError::MintError(data.detail)),
                     }
                 }
             }
@@ -152,11 +152,11 @@ async fn extract_response_data<T: serde::de::DeserializeOwned>(
                 .unwrap();
 
             // FIXME: use the error code to return a proper error
-            match data.error.as_str() {
+            match data.detail.as_str() {
                 "Lightning invoice not paid yet." => {
-                    Err(MokshaWalletError::InvoiceNotPaidYet(data.code, data.error))
+                    Err(MokshaWalletError::InvoiceNotPaidYet(data.code, data.detail))
                 }
-                _ => Err(MokshaWalletError::MintError(data.error)),
+                _ => Err(MokshaWalletError::MintError(data.detail)),
             }
         }
     }

diff --git a/moksha-core/src/primitives.rs b/moksha-core/src/primitives.rs
@@ -73,7 +73,7 @@ impl PostSwapResponse {
 #[derive(Deserialize, Debug)]
 pub struct CashuErrorResponse {
     pub code: u64,
-    pub error: String,
+    pub detail: String,
 }
 
 #[skip_serializing_none]

diff --git a/moksha-mint/src/error.rs b/moksha-mint/src/error.rs
@@ -73,7 +73,7 @@ impl IntoResponse for MokshaMintError {
 
         let body = Json(json!({
             "code": 0,
-            "error": self.to_string(),
+            "detail": self.to_string(),
         }));
 
         (status, body).into_response()

diff --git a/moksha-wallet/src/client/reqwest.rs b/moksha-wallet/src/client/reqwest.rs
@@ -166,11 +166,11 @@ async fn extract_response_data<T: serde::de::DeserializeOwned>(
                         .unwrap();
 
                     // FIXME: use the error code to return a proper error
-                    match data.error.as_str() {
+                    match data.detail.as_str() {
                         "Lightning invoice not paid yet." => {
-                            Err(MokshaWalletError::InvoiceNotPaidYet(data.code, data.error))
+                            Err(MokshaWalletError::InvoiceNotPaidYet(data.code, data.detail))
                         }
-                        _ => Err(MokshaWalletError::MintError(data.error)),
+                        _ => Err(MokshaWalletError::MintError(data.detail)),
                     }
                 }
             }
@@ -182,11 +182,11 @@ async fn extract_response_data<T: serde::de::DeserializeOwned>(
                 .unwrap();
 
             // FIXME: use the error code to return a proper error
-            match data.error.as_str() {
+            match data.detail.as_str() {
                 "Lightning invoice not paid yet." => {
-                    Err(MokshaWalletError::InvoiceNotPaidYet(data.code, data.error))
+                    Err(MokshaWalletError::InvoiceNotPaidYet(data.code, data.detail))
                 }
-                _ => Err(MokshaWalletError::MintError(data.error)),
+                _ => Err(MokshaWalletError::MintError(data.detail)),
             }
         }
     }
@@ -196,10 +196,10 @@ async fn extract_response_data<T: serde::de::DeserializeOwned>(
 mod tests {
     #[test]
     fn test_deserialize_error() -> anyhow::Result<()> {
-        let input = "{\"code\":0,\"error\":\"Lightning invoice not paid yet.\"}";
+        let input = "{\"code\":0,\"detail\":\"Lightning invoice not paid yet.\"}";
         let data = serde_json::from_str::<super::CashuErrorResponse>(input)?;
         assert_eq!(data.code, 0);
-        assert_eq!(data.error, "Lightning invoice not paid yet.");
+        assert_eq!(data.detail, "Lightning invoice not paid yet.");
         Ok(())
     }
 }