Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update liana gui to import liana directly #1473

Merged
merged 2 commits into from
Nov 19, 2024
Merged

Update liana gui to import liana directly #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0fbe08
liana-gui: import liana with directory path
edouardparis Nov 18, 2024
6cefd24
remove liana from vendored source link
edouardparis Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions contrib/reproducible/guix/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ directory = "/vendor"
[source.crates-io]
replace-with = "vendored_sources"

[source."https://github.com/wizardsardine/liana"]
git = "https://github.com/wizardsardine/liana"
branch = "master"
replace-with = "vendored_sources"

[source."https://github.com/edouardparis/iced"]
git = "https://github.com/edouardparis/iced"
branch = "patch-0.12.3"
Expand Down
2 changes: 1 addition & 1 deletion liana-gui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion liana-gui/src/daemon/embedded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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),
}
}
Expand Down
4 changes: 1 addition & 3 deletions liana-gui/src/installer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))),
Expand Down Expand Up @@ -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
Expand Down
Loading