chore(error handling): Add reason to order rejected failure type

get10101 · Mar 6, 2024 · bb70acb · bb70acb
1 parent 7a54139
commit bb70acb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/mobile/lib/features/trade/domain/order.dart b/mobile/lib/features/trade/domain/order.dart
@@ -66,8 +66,6 @@ class FailureReason {
   static const FailureReason timeout = FailureReason._(
       failureType: FailureReasonType.timeout,
       details: "The order timed out before finding a match");
-  static const FailureReason rejected =
-      FailureReason._(failureType: FailureReasonType.rejected, details: "The order was rejected.");
   static const FailureReason unknown = FailureReason._(
       failureType: FailureReasonType.unknown, details: "An unknown error occurred.");
 
@@ -90,7 +88,8 @@ class FailureReason {
       case bridge.FailureReason_TimedOut():
         return timeout;
       case bridge.FailureReason_OrderRejected():
-        return rejected;
+        return FailureReason._(
+            failureType: FailureReasonType.rejected, details: failureReason.field0);
       case bridge.FailureReason_Unknown():
         return unknown;
     }

diff --git a/mobile/native/src/db/models.rs b/mobile/native/src/db/models.rs
@@ -660,7 +660,7 @@ pub enum FailureReason {
     SubchannelOfferOutdated,
     SubchannelOfferDateUndetermined,
     SubchannelOfferUnacceptable,
-    OrderRejected,
+    OrderRejected(String),
     Unknown,
 }
 
@@ -694,7 +694,9 @@ impl From<FailureReason> for crate::trade::order::FailureReason {
                     InvalidSubchannelOffer::Unacceptable,
                 )
             }
-            FailureReason::OrderRejected => crate::trade::order::FailureReason::OrderRejected,
+            FailureReason::OrderRejected(reason) => {
+                crate::trade::order::FailureReason::OrderRejected(reason)
+            }
             FailureReason::Unknown => crate::trade::order::FailureReason::Unknown,
         }
     }
@@ -722,7 +724,9 @@ impl From<crate::trade::order::FailureReason> for FailureReason {
                 }
                 InvalidSubchannelOffer::Unacceptable => FailureReason::SubchannelOfferUnacceptable,
             },
-            crate::trade::order::FailureReason::OrderRejected => FailureReason::OrderRejected,
+            crate::trade::order::FailureReason::OrderRejected(reason) => {
+                FailureReason::OrderRejected(reason)
+            }
             crate::trade::order::FailureReason::Unknown => FailureReason::Unknown,
         }
     }

diff --git a/mobile/native/src/trade/order/api.rs b/mobile/native/src/trade/order/api.rs
@@ -44,7 +44,7 @@ pub enum FailureReason {
     OrderNotAcceptable,
     TimedOut,
     InvalidDlcOffer,
-    OrderRejected,
+    OrderRejected(String),
     Unknown,
 }
 
@@ -144,7 +144,7 @@ impl From<order::FailureReason> for FailureReason {
             order::FailureReason::OrderNotAcceptable => FailureReason::OrderNotAcceptable,
             order::FailureReason::TimedOut => FailureReason::TimedOut,
             order::FailureReason::InvalidDlcOffer(_) => FailureReason::InvalidDlcOffer,
-            order::FailureReason::OrderRejected => FailureReason::OrderRejected,
+            order::FailureReason::OrderRejected(reason) => FailureReason::OrderRejected(reason),
             order::FailureReason::CollabRevert => FailureReason::CollabRevert,
             order::FailureReason::Unknown => FailureReason::Unknown,
         }

diff --git a/mobile/native/src/trade/order/handler.rs b/mobile/native/src/trade/order/handler.rs
@@ -116,7 +116,7 @@ pub async fn submit_order(
         update_order_state_in_db_and_ui(
             order.id,
             OrderState::Failed {
-                reason: FailureReason::OrderRejected,
+                reason: FailureReason::OrderRejected(err.to_string()),
             },
         )
         .map_err(SubmitOrderError::Storage)?;

diff --git a/mobile/native/src/trade/order/mod.rs b/mobile/native/src/trade/order/mod.rs
@@ -38,7 +38,7 @@ pub enum FailureReason {
     TimedOut,
     InvalidDlcOffer(InvalidSubchannelOffer),
     /// The order has been rejected by the orderbook
-    OrderRejected,
+    OrderRejected(String),
     Unknown,
 }
 

diff --git a/mobile/native/src/trade/order/orderbook_client.rs b/mobile/native/src/trade/order/orderbook_client.rs
@@ -34,8 +34,8 @@ impl OrderbookClient {
             let response = response.json().await?;
             Ok(response)
         } else {
-            tracing::error!("Could not create new order");
-            bail!("Could not create new order: {response:?}")
+            let error = response.text().await?;
+            bail!("Could not create new order: {error}")
         }
     }
 }
diff --git a/webapp/src/api.rs b/webapp/src/api.rs
@@ -417,7 +417,7 @@ impl From<&native::trade::order::Order> for Order {
                         }
                         InvalidSubchannelOffer::Unacceptable => "OfferUnacceptable",
                     },
-                    FailureReason::OrderRejected => "OrderRejected",
+                    FailureReason::OrderRejected(_) => "OrderRejected",
                     FailureReason::Unknown => "Unknown",
                 }
                 .to_string();