Properly convert breez payment to ours

Author: benthecarman

orange-sdk/src/trusted_wallet/spark.rs

@@ -139,20 +139,8 @@ impl TrustedWalletInterface for Spark {
 				.list_payments(ListPaymentsRequest { limit: None, offset: None })
 				.await?;
 
-			let payments = resp
-				.payments
-				.into_iter()
-				.map(|p| {
-					parse_payment_id(&p.id).map(|id| Payment {
-						id,
-						amount: Amount::from_sats(p.amount).unwrap(),
-						fee: Amount::from_sats(p.fees).unwrap(),
-						status: p.status.into(),
-						outbound: p.payment_type == PaymentType::Send,
-						time_since_epoch: Duration::from_secs(p.timestamp),
-					})
-				})
-				.collect::<Result<_, _>>()?;
+			let payments =
+				resp.payments.into_iter().map(|p| p.try_into()).collect::<Result<_, _>>()?;
 
 			Ok(payments)
 		})
@@ -614,3 +602,20 @@ impl breez_sdk_spark::Storage for SparkStore {
 		Ok(())
 	}
 }
+
+impl TryFrom<breez_sdk_spark::Payment> for Payment {
+	type Error = TrustedError;
+
+	fn try_from(value: breez_sdk_spark::Payment) -> Result<Self, Self::Error> {
+		let id = parse_payment_id(&value.id)?;
+
+		Ok(Payment {
+			id,
+			amount: Amount::from_sats(value.amount).map_err(|_| TrustedError::AmountError)?,
+			fee: Amount::from_sats(value.fees).map_err(|_| TrustedError::AmountError)?,
+			status: value.status.into(),
+			outbound: value.payment_type == PaymentType::Send,
+			time_since_epoch: Duration::from_secs(value.timestamp),
+		})
+	}
+}