From 6aa7209f5f89ce4a3f9165399b607637c8e07f1e Mon Sep 17 00:00:00 2001 From: ok300 <106775972+ok300@users.noreply.github.com> Date: Mon, 15 Apr 2024 09:12:26 +0200 Subject: [PATCH] Rename BoltzGeneric error variant --- lib/ls-sdk-bindings/src/ls_sdk.udl | 2 +- lib/ls-sdk-core/src/model.rs | 8 ++++---- lib/ls-sdk-core/src/wallet.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ls-sdk-bindings/src/ls_sdk.udl b/lib/ls-sdk-bindings/src/ls_sdk.udl index c726666b2..940ddd154 100644 --- a/lib/ls-sdk-bindings/src/ls_sdk.udl +++ b/lib/ls-sdk-bindings/src/ls_sdk.udl @@ -12,7 +12,7 @@ enum PaymentError { "PersistError", "InvalidPreimage", "AlreadyClaimed", - "BoltzGeneric", + "BoltzError", }; enum Network { diff --git a/lib/ls-sdk-core/src/model.rs b/lib/ls-sdk-core/src/model.rs index 90ce6207d..87f072459 100644 --- a/lib/ls-sdk-core/src/model.rs +++ b/lib/ls-sdk-core/src/model.rs @@ -104,8 +104,8 @@ pub enum PaymentError { #[error("The specified funds have already been claimed")] AlreadyClaimed, - #[error("Generic boltz error: {err}")] - BoltzGeneric { err: String }, + #[error("Boltz error: {err}")] + BoltzError { err: String }, } impl From for PaymentError { @@ -116,9 +116,9 @@ impl From for PaymentError { return PaymentError::AlreadyClaimed; } - PaymentError::BoltzGeneric { err: msg } + PaymentError::BoltzError { err: msg } } - _ => PaymentError::BoltzGeneric { + _ => PaymentError::BoltzError { err: format!("{err:?}"), }, } diff --git a/lib/ls-sdk-core/src/wallet.rs b/lib/ls-sdk-core/src/wallet.rs index bc770f916..172bb562f 100644 --- a/lib/ls-sdk-core/src/wallet.rs +++ b/lib/ls-sdk-core/src/wallet.rs @@ -376,7 +376,7 @@ impl Wallet { // TODO The request should not allow setting both invoice and onchain amounts, so this case shouldn't be possible. // See example of how it's done in the SDK. - _ => Err(PaymentError::BoltzGeneric { + _ => Err(PaymentError::BoltzError { err: "Both invoice and onchain amounts were specified".into(), }), }?;