Merge branch 'main' into mock-deps

Cargo.toml

@@ -2,7 +2,7 @@
 members = [
     "mock/breez-sdk",
     "parser",
-    "pocket_client"
+    "pocketclient"
 ]
 
 [package]
@@ -16,7 +16,7 @@ name = "uniffi_lipalightninglib"
 
 [dependencies]
 parser = { path = "parser" }
-pocket_client = { path = "pocket_client" }
+pocketclient = { path = "pocketclient" }
 
 chameleon = { git = "https://github.com/getlipa/wild", tag = "v1.23.0", optional = true }
 chameleon-mock = { path = "mock/wild/chameleon", optional = true }

pocket_client/Cargo.toml → pocketclient/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "pocket_client"
+name = "pocketclient"
 version = "0.1.0"
 edition = "2021"
 

pocket_client/src/lib.rs → pocketclient/src/lib.rs

@@ -192,7 +192,7 @@ impl PocketClient {
             raw_response.status() == StatusCode::CREATED,
             runtime_error(
                 PocketClientErrorCode::UnexpectedResponse,
-                "Got unexpected response to Pocket challenge request: Pocket API returned status"
+                "Got unexpected response to Pocket challenge request"
             )
         );
 
@@ -257,7 +257,7 @@ impl PocketClient {
             raw_response.status() == StatusCode::CREATED,
             runtime_error(
                 PocketClientErrorCode::UnexpectedResponse,
-                "Got unexpected response to Pocket order creation request: Pocket API returned status {}"
+                "Got unexpected response to Pocket order creation request"
             )
         );
 

src/data_store.rs

@@ -2,7 +2,7 @@ use crate::errors::Result;
 use crate::fund_migration::MigrationStatus;
 use crate::migrations::migrate;
 use crate::{ExchangeRate, OfferKind, PocketOfferError, TzConfig, UserPreferences};
-use pocket_client::FiatTopupInfo;
+use pocketclient::FiatTopupInfo;
 
 use crate::analytics::AnalyticsConfig;
 use chrono::{DateTime, Utc};
@@ -650,7 +650,7 @@ mod tests {
     use crate::analytics::AnalyticsConfig;
     use crow::TopupError::TemporaryFailure;
     use crow::{PermanentFailureCode, TemporaryFailureCode};
-    use pocket_client::FiatTopupInfo;
+    use pocketclient::FiatTopupInfo;
     use std::fs;
     use std::thread::sleep;
     use std::time::{Duration, SystemTime, UNIX_EPOCH};

src/lib.rs

@@ -89,8 +89,8 @@ use crate::task_manager::TaskManager;
 use crate::util::{
     replace_byte_arrays_by_hex_string, unix_timestamp_to_system_time, LogIgnoreError,
 };
-pub use pocket_client::FiatTopupInfo;
-use pocket_client::PocketClient;
+pub use pocketclient::FiatTopupInfo;
+use pocketclient::PocketClient;
 
 pub use breez_sdk_core::error::ReceiveOnchainError as SwapError;
 use breez_sdk_core::error::{ReceiveOnchainError, SendPaymentError};