sdk: Use SdkApiError

Author: MaxFangX

Cargo.lock

@@ -35,7 +35,6 @@ lexe-tokio.path = "../lexe-tokio"
 anyhow.workspace = true
 axum = { workspace = true, features = ["json", "query"] }
 axum-server.workspace = true
-base64.workspace = true
 bcs.workspace = true
 bytes.workspace = true
 http.workspace = true

lexe-api/Cargo.toml

@@ -6,13 +6,12 @@
 // We don't export our traits currently so auto trait stability is not relevant.
 #![allow(async_fn_in_trait)]
 
-use crate::{
-    SdkApiError,
-    models::{
-        SdkCreateInvoiceRequest, SdkCreateInvoiceResponse,
-        SdkGetPaymentRequest, SdkGetPaymentResponse, SdkNodeInfoResponse,
-        SdkPayInvoiceRequest, SdkPayInvoiceResponse,
-    },
+use lexe_api_core::error::SdkApiError;
+
+use crate::models::{
+    SdkCreateInvoiceRequest, SdkCreateInvoiceResponse, SdkGetPaymentRequest,
+    SdkGetPaymentResponse, SdkNodeInfoResponse, SdkPayInvoiceRequest,
+    SdkPayInvoiceResponse,
 };
 
 /// The API exposed to SDK users.

sdk-core/src/def.rs

@@ -8,9 +8,3 @@ pub mod def;
 pub mod models;
 /// Shared API types.
 pub mod types;
-
-// TODO(max): Replace these with LexeError
-/// Temporary type alias for the errors returned by SDK APIs.
-pub type SdkApiError = lexe_api_core::error::NodeApiError;
-/// Temporary type alias for the error kinds returned by SDK APIs.
-pub type SdkErrorKind = lexe_api_core::error::NodeErrorKind;

sdk-core/src/lib.rs

@@ -1,6 +1,9 @@
-use lexe_api::{rest::RestClient, types::Empty};
+use lexe_api::{
+    error::{SdkApiError, SdkErrorKind},
+    rest::RestClient,
+    types::Empty,
+};
 use sdk_core::{
-    SdkApiError, SdkErrorKind,
     def::SdkApi,
     models::{
         SdkCreateInvoiceRequest, SdkCreateInvoiceResponse,

sdk-sidecar/src/client.rs

@@ -6,9 +6,10 @@
 // We don't export our traits currently so auto trait stability is not relevant.
 #![allow(async_fn_in_trait)]
 
+use lexe_api::error::SdkApiError;
 #[cfg(doc)]
 use lexe_api::types::Empty;
-use sdk_core::{SdkApiError, def::SdkApi};
+use sdk_core::def::SdkApi;
 
 use crate::api::HealthCheckResponse;
 

sdk-sidecar/src/def.rs

@@ -4,11 +4,11 @@ use anyhow::Context;
 use axum::extract::FromRequestParts;
 use common::{ed25519, rng::SysRng};
 use http::header::AUTHORIZATION;
+use lexe_api::error::SdkApiError;
 use node_client::{
     client::{GatewayClient, NodeClient},
     credentials::{ClientCredentials, Credentials},
 };
-use sdk_core::SdkApiError;
 
 use crate::server::RouterState;
 

sdk-sidecar/src/extract.rs

@@ -11,15 +11,14 @@ use axum::{
 use common::{ed25519, env::DeployEnv};
 use lexe_api::{
     def::AppNodeRunApi,
-    error::NodeErrorKind,
+    error::{SdkApiError, SdkErrorKind},
     models::command::{CreateInvoiceResponse, LxPaymentIdStruct},
     server::{LxJson, extract::LxQuery},
     types::payments::PaymentCreatedIndex,
 };
 use node_client::client::NodeClient;
 use quick_cache::unsync;
 use sdk_core::{
-    SdkApiError,
     models::{
         SdkCreateInvoiceRequest, SdkCreateInvoiceResponse,
         SdkGetPaymentRequest, SdkGetPaymentResponse, SdkNodeInfoResponse,
@@ -121,11 +120,11 @@ mod node {
         State(_): State<Arc<RouterState>>,
         NodeClientExtractor(node_client): NodeClientExtractor,
     ) -> Result<LxJson<SdkNodeInfoResponse>, SdkApiError> {
-        node_client
+        let info = node_client
             .node_info()
             .await
-            .map(SdkNodeInfoResponse::from)
-            .map(LxJson)
+            .map_err(SdkApiError::command)?;
+        Ok(LxJson(SdkNodeInfoResponse::from(info)))
     }
 
     #[instrument(skip_all, name = "(create-invoice)")]
@@ -137,7 +136,10 @@ mod node {
         let CreateInvoiceResponse {
             invoice,
             created_index: maybe_index,
-        } = node_client.create_invoice(req.into()).await?;
+        } = node_client
+            .create_invoice(req.into())
+            .await
+            .map_err(SdkApiError::command)?;
 
         let index = maybe_index
             .ok_or("Node out-of-date. Upgrade to node-v0.8.10 or later.")
@@ -153,7 +155,11 @@ mod node {
         LxJson(req): LxJson<SdkPayInvoiceRequest>,
     ) -> Result<LxJson<SdkPayInvoiceResponse>, SdkApiError> {
         let id = req.invoice.payment_id();
-        let created_at = node_client.pay_invoice(req.into()).await?.created_at;
+        let created_at = node_client
+            .pay_invoice(req.into())
+            .await
+            .map_err(SdkApiError::command)?
+            .created_at;
         let resp = SdkPayInvoiceResponse {
             index: PaymentCreatedIndex { id, created_at },
             created_at,
@@ -174,7 +180,7 @@ mod node {
             Ok(LxJson(payment)) => Ok(LxJson(SdkGetPaymentResponse {
                 payment: Some(payment),
             })),
-            Err(e) if e.kind == NodeErrorKind::NotFound =>
+            Err(e) if e.kind == SdkErrorKind::NotFound =>
                 Ok(LxJson(SdkGetPaymentResponse { payment: None })),
             Err(e) => Err(e),
         }
@@ -200,7 +206,8 @@ mod node {
 
         let maybe_basic_payment = node_client
             .get_payment_by_id(LxPaymentIdStruct { id })
-            .await?
+            .await
+            .map_err(SdkApiError::command)?
             .maybe_payment;
 
         let basic_payment = match maybe_basic_payment {