liana-gui: import liana with directory path

This commit is contained in:
edouardparis 2024-11-18 16:02:16 +01:00
parent c14c55beee
commit b0fbe0839d
4 changed files with 7 additions and 29 deletions

26
Cargo.lock generated
View File

@ -2821,34 +2821,12 @@ dependencies = [
"toml",
]
[[package]]
name = "liana"
version = "8.0.0"
source = "git+https://github.com/wizardsardine/liana?branch=master#f3206f9dfadbedb7a46aaa85996c11172c875588"
dependencies = [
"backtrace",
"bdk_coin_select",
"bdk_electrum",
"bip39",
"dirs 5.0.1",
"fern",
"getrandom",
"jsonrpc 0.17.0",
"log",
"miniscript",
"rdrand",
"rusqlite",
"serde",
"serde_json",
"toml",
]
[[package]]
name = "liana-fuzz"
version = "0.0.0"
dependencies = [
"arbitrary",
"liana 8.0.0",
"liana",
"libfuzzer-sys",
"secp256k1 0.28.2",
]
@ -2870,7 +2848,7 @@ dependencies = [
"iced",
"iced_runtime",
"jsonrpc 0.12.1",
"liana 8.0.0 (git+https://github.com/wizardsardine/liana?branch=master)",
"liana",
"liana-ui",
"log",
"reqwest",

View File

@ -16,7 +16,7 @@ path = "src/main.rs"
[dependencies]
async-trait = "0.1"
async-hwi = { version = "0.0.24" }
liana = { git = "https://github.com/wizardsardine/liana", branch = "master", default-features = false, features = ["nonblocking_shutdown"] }
liana = { path = "../liana", default-features = false, features = ["nonblocking_shutdown"] }
liana-ui = { path = "../liana-ui" }
backtrace = "0.3"
hex = "0.4.3"

View File

@ -18,7 +18,8 @@ pub struct EmbeddedDaemon {
impl EmbeddedDaemon {
pub fn start(config: Config) -> Result<EmbeddedDaemon, DaemonError> {
let handle = DaemonHandle::start_default(config.clone()).map_err(DaemonError::Start)?;
let handle =
DaemonHandle::start_default(config.clone(), false).map_err(DaemonError::Start)?;
Ok(Self {
handle: Mutex::new(Some(handle)),
config,
@ -31,6 +32,7 @@ impl EmbeddedDaemon {
{
match self.handle.lock().await.as_mut() {
Some(DaemonHandle::Controller { control, .. }) => method(control),
Some(_) => unreachable!("No lianad rpc server must be started"),
None => Err(DaemonError::DaemonStopped),
}
}

View File

@ -334,7 +334,7 @@ impl Installer {
pub fn daemon_check(cfg: liana::config::Config) -> Result<(), Error> {
// Start Daemon to check correctness of installation
match liana::DaemonHandle::start_default(cfg) {
match liana::DaemonHandle::start_default(cfg, false) {
Ok(daemon) => daemon
.stop()
.map_err(|e| Error::Unexpected(format!("Failed to stop Liana daemon: {}", e))),
@ -685,8 +685,6 @@ pub async fn extract_local_gui_settings(ctx: &Context) -> Settings {
pub fn extract_daemon_config(ctx: &Context) -> Config {
Config {
#[cfg(unix)]
daemon: false,
log_level: log::LevelFilter::Info,
main_descriptor: ctx
.descriptor