diff --git a/liana-gui/src/app/settings.rs b/liana-gui/src/app/settings.rs index a9e08812..3b10ddc0 100644 --- a/liana-gui/src/app/settings.rs +++ b/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"; diff --git a/liana-gui/src/backup.rs b/liana-gui/src/backup.rs index 4a272ab0..57d3ec89 100644 --- a/liana-gui/src/backup.rs +++ b/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, }; diff --git a/liana-gui/src/export.rs b/liana-gui/src/export.rs index 52015dc9..ffa9c805 100644 --- a/liana-gui/src/export.rs +++ b/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; diff --git a/liana-gui/src/installer/context.rs b/liana-gui/src/installer/context.rs index 025349bc..c150cb94 100644 --- a/liana-gui/src/installer/context.rs +++ b/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; diff --git a/liana-gui/src/installer/message.rs b/liana-gui/src/installer/message.rs index 615228a8..c1ee32ca 100644 --- a/liana-gui/src/installer/message.rs +++ b/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)] diff --git a/liana-gui/src/installer/mod.rs b/liana-gui/src/installer/mod.rs index b60a3607..bb2cf85f 100644 --- a/liana-gui/src/installer/mod.rs +++ b/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, }; diff --git a/liana-gui/src/installer/step/backend.rs b/liana-gui/src/installer/step/backend.rs index 169babd9..1b79c24d 100644 --- a/liana-gui/src/installer/step/backend.rs +++ b/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}, diff --git a/liana-gui/src/lib.rs b/liana-gui/src/lib.rs index 42217a14..df620545 100644 --- a/liana-gui/src/lib.rs +++ b/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; diff --git a/liana-gui/src/main.rs b/liana-gui/src/main.rs index ec867a14..ae22f735 100644 --- a/liana-gui/src/main.rs +++ b/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, }; diff --git a/liana-gui/src/lianalite/client/auth.rs b/liana-gui/src/services/connect/client/auth.rs similarity index 100% rename from liana-gui/src/lianalite/client/auth.rs rename to liana-gui/src/services/connect/client/auth.rs diff --git a/liana-gui/src/lianalite/client/backend/api.rs b/liana-gui/src/services/connect/client/backend/api.rs similarity index 100% rename from liana-gui/src/lianalite/client/backend/api.rs rename to liana-gui/src/services/connect/client/backend/api.rs diff --git a/liana-gui/src/lianalite/client/backend/mod.rs b/liana-gui/src/services/connect/client/backend/mod.rs similarity index 100% rename from liana-gui/src/lianalite/client/backend/mod.rs rename to liana-gui/src/services/connect/client/backend/mod.rs diff --git a/liana-gui/src/lianalite/client/mod.rs b/liana-gui/src/services/connect/client/mod.rs similarity index 100% rename from liana-gui/src/lianalite/client/mod.rs rename to liana-gui/src/services/connect/client/mod.rs diff --git a/liana-gui/src/lianalite/login.rs b/liana-gui/src/services/connect/login.rs similarity index 100% rename from liana-gui/src/lianalite/login.rs rename to liana-gui/src/services/connect/login.rs diff --git a/liana-gui/src/lianalite/mod.rs b/liana-gui/src/services/connect/mod.rs similarity index 100% rename from liana-gui/src/lianalite/mod.rs rename to liana-gui/src/services/connect/mod.rs diff --git a/liana-gui/src/services/mod.rs b/liana-gui/src/services/mod.rs index 703bc087..c6c16e26 100644 --- a/liana-gui/src/services/mod.rs +++ b/liana-gui/src/services/mod.rs @@ -1 +1,2 @@ +pub mod connect; pub mod keys;