Move lianalite to services::connect module

liana-gui/src/app/settings.rs

@@ -12,8 +12,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     backup::{Key, KeyRole, KeyType},
     hw::HardwareWalletConfig,
-    lianalite::client::backend,
-    services,
+    services::{self, connect::client::backend},
 };
 
 pub const DEFAULT_FILE_NAME: &str = "settings.json";

liana-gui/src/backup.rs

@@ -26,7 +26,7 @@ use crate::{
         extract_daemon_config, extract_local_gui_settings, extract_remote_gui_settings, Context,
         RemoteBackend,
     },
-    lianalite::client::backend::api::DEFAULT_LIMIT,
+    services::connect::client::backend::api::DEFAULT_LIMIT,
     VERSION,
 };
 

liana-gui/src/export.rs

@@ -44,8 +44,8 @@ use crate::{
         model::{HistoryTransaction, Labelled},
         Daemon, DaemonBackend, DaemonError,
     },
-    lianalite::client::backend::api::DEFAULT_LIMIT,
     node::bitcoind::Bitcoind,
+    services::connect::client::backend::api::DEFAULT_LIMIT,
 };
 
 const DUMP_LABELS_LIMIT: u32 = 100;

liana-gui/src/installer/context.rs

@@ -6,8 +6,8 @@ use std::time::Duration;
 use crate::{
     app::settings::KeySetting,
     backup::Backup,
-    lianalite::client::backend::{BackendClient, BackendWalletClient},
     node::bitcoind::{Bitcoind, InternalBitcoindConfig},
+    services::connect::client::backend::{BackendClient, BackendWalletClient},
     signer::Signer,
 };
 use async_hwi::DeviceKind;

liana-gui/src/installer/message.rs

@@ -15,12 +15,14 @@ use crate::{
     export::ImportExportMessage,
     hw::HardwareWalletMessage,
     installer::descriptor::{Key, PathKind},
-    lianalite::client::{auth::AuthClient, backend::api},
     node::{
         bitcoind::{Bitcoind, ConfigField, RpcAuthType},
         electrum, NodeType,
     },
-    services,
+    services::{
+        self,
+        connect::client::{auth::AuthClient, backend::api},
+    },
 };
 
 #[derive(Debug, Clone)]

liana-gui/src/installer/mod.rs

@@ -29,14 +29,16 @@ use crate::{
     daemon::DaemonError,
     datadir::create_directory,
     hw::{HardwareWalletConfig, HardwareWallets},
-    lianalite::client::{
-        auth::AuthError,
-        backend::{
-            api::payload::{Provider, ProviderKey},
-            BackendClient, BackendWalletClient,
+    services::{
+        self,
+        connect::client::{
+            auth::AuthError,
+            backend::{
+                api::payload::{Provider, ProviderKey},
+                BackendClient, BackendWalletClient,
+            },
         },
     },
-    services,
     signer::Signer,
 };
 

liana-gui/src/installer/step/backend.rs

@@ -14,7 +14,7 @@ use crate::{
         step::Step,
         view, Error,
     },
-    lianalite::client::{
+    services::connect::client::{
         self,
         auth::{AuthClient, AuthError},
         backend::{api, BackendClient},

liana-gui/src/lib.rs

@@ -7,7 +7,6 @@ pub mod export;
 pub mod hw;
 pub mod installer;
 pub mod launcher;
-pub mod lianalite;
 pub mod loader;
 pub mod logger;
 pub mod node;

liana-gui/src/main.rs

@@ -28,12 +28,12 @@ use liana_gui::{
     hw::HardwareWalletConfig,
     installer::{self, Installer},
     launcher::{self, Launcher},
-    lianalite::{
+    loader::{self, Loader},
+    logger::Logger,
+    services::connect::{
         client::backend::{api, BackendWalletClient},
         login,
     },
-    loader::{self, Loader},
-    logger::Logger,
     VERSION,
 };
 

liana-gui/src/services/mod.rs

@@ -1 +1,2 @@
+pub mod connect;
 pub mod keys;