From c14c55beeea56655096eb873ba0bce4d37ccd6bb Mon Sep 17 00:00:00 2001 From: edouardparis Date: Mon, 18 Nov 2024 12:31:50 +0100 Subject: [PATCH] remove daemonize from config --- contrib/lianad_config_example.toml | 3 --- liana/src/config.rs | 19 ------------------- liana/src/lib.rs | 2 -- liana/src/testutils.rs | 2 -- tests/test_framework/lianad.py | 1 - 5 files changed, 27 deletions(-) diff --git a/contrib/lianad_config_example.toml b/contrib/lianad_config_example.toml index b0edd609..35b4b256 100644 --- a/contrib/lianad_config_example.toml +++ b/contrib/lianad_config_example.toml @@ -1,6 +1,3 @@ -# Whether to run the process as a UNIX daemon (double fork magic) -daemon = false - # (Optional) Path to the folder where we should store the application data. # Defaults to `.lianad` in your home folder. data_dir = "/home/wizardsardine/.lianad" diff --git a/liana/src/config.rs b/liana/src/config.rs index ab3f70bd..2399e161 100644 --- a/liana/src/config.rs +++ b/liana/src/config.rs @@ -80,11 +80,6 @@ fn default_poll_interval() -> Duration { Duration::from_secs(30) } -#[cfg(unix)] -fn default_daemon() -> bool { - false -} - /// Bitcoin backend config. #[derive(Debug, Clone, Deserialize, Serialize)] pub enum BitcoinBackend { @@ -153,10 +148,6 @@ pub struct BitcoinConfig { pub struct Config { /// An optional custom data directory pub data_dir: Option, - /// Whether to daemonize the process - #[cfg(unix)] - #[serde(default = "default_daemon")] - pub daemon: bool, /// What messages to log #[serde( deserialize_with = "deserialize_fromstr", @@ -303,7 +294,6 @@ mod tests { // A valid config let toml_str = r#" data_dir = "/home/wizardsardine/custom/folder/" - daemon = false log_level = "debug" main_descriptor = "wsh(andor(pk([aabbccdd]tpubDEN9WSToTyy9ZQfaYqSKfmVqmq1VVLNtYfj3Vkqh67et57eJ5sTKZQBkHqSwPUsoSskJeaYnPttHe2VrkCsKA27kUaN9SDc5zhqeLzKa1rr/<0;1>/*),older(10000),pk([aabbccdd]tpubD8LYfn6njiA2inCoxwM7EuN3cuLVcaHAwLYeups13dpevd3nHLRdK9NdQksWXrhLQVxcUZRpnp5CkJ1FhE61WRAsHxDNAkvGkoQkAeWDYjV/<0;1>/*)))#dw4ulnrs" @@ -318,11 +308,9 @@ mod tests { toml::from_str::(&toml_str).expect("Deserializing toml_str"); // A valid, round-tripping, config - #[cfg(unix)] // On non-UNIX there is no 'daemon' member. { let toml_str = r#" data_dir = '/home/wizardsardine/custom/folder/' - daemon = false log_level = 'TRACE' main_descriptor = 'wsh(andor(pk([aabbccdd]tpubDEN9WSToTyy9ZQfaYqSKfmVqmq1VVLNtYfj3Vkqh67et57eJ5sTKZQBkHqSwPUsoSskJeaYnPttHe2VrkCsKA27kUaN9SDc5zhqeLzKa1rr/<0;1>/*),older(10000),pk([aabbccdd]tpubD8LYfn6njiA2inCoxwM7EuN3cuLVcaHAwLYeups13dpevd3nHLRdK9NdQksWXrhLQVxcUZRpnp5CkJ1FhE61WRAsHxDNAkvGkoQkAeWDYjV/<0;1>/*)))#dw4ulnrs' @@ -340,12 +328,9 @@ mod tests { } // A valid, round-tripping, config for a Taproot descriptor. - - #[cfg(unix)] // On non-UNIX there is no 'daemon' member. { let toml_str = r#" data_dir = '/home/wizardsardine/custom/folder/' - daemon = false log_level = 'TRACE' main_descriptor = 'tr([abcdef01]xpub6Eze7yAT3Y1wGrnzedCNVYDXUqa9NmHVWck5emBaTbXtURbe1NWZbK9bsz1TiVE7Cz341PMTfYgFw1KdLWdzcM1UMFTcdQfCYhhXZ2HJvTW/<0;1>/*,and_v(v:pk([abcdef01]xpub688Hn4wScQAAiYJLPg9yH27hUpfZAUnmJejRQBCiwfP5PEDzjWMNW1wChcninxr5gyavFqbbDjdV1aK5USJz8NDVjUy7FRQaaqqXHh5SbXe/<0;1>/*),older(52560)))#0mt7e93c' @@ -363,11 +348,9 @@ mod tests { } // A valid, round-tripping, config with `auth` instead of `cookie_path` - #[cfg(unix)] // On non-UNIX there is no 'daemon' member. { let toml_str = r#" data_dir = '/home/wizardsardine/custom/folder/' - daemon = false log_level = 'TRACE' main_descriptor = 'wsh(andor(pk([aabbccdd]tpubDEN9WSToTyy9ZQfaYqSKfmVqmq1VVLNtYfj3Vkqh67et57eJ5sTKZQBkHqSwPUsoSskJeaYnPttHe2VrkCsKA27kUaN9SDc5zhqeLzKa1rr/<0;1>/*),older(10000),pk([aabbccdd]tpubD8LYfn6njiA2inCoxwM7EuN3cuLVcaHAwLYeups13dpevd3nHLRdK9NdQksWXrhLQVxcUZRpnp5CkJ1FhE61WRAsHxDNAkvGkoQkAeWDYjV/<0;1>/*)))#dw4ulnrs' @@ -386,7 +369,6 @@ mod tests { // Invalid desc checksum let toml_str = r#" - daemon = false log_level = "trace" data_dir = "/home/wizardsardine/custom/folder/" @@ -405,7 +387,6 @@ mod tests { // Not enough parameters: missing the Bitcoin network let toml_str = r#" - daemon = false log_level = "trace" data_dir = "/home/wizardsardine/custom/folder/" diff --git a/liana/src/lib.rs b/liana/src/lib.rs index a04acd12..23ed20cc 100644 --- a/liana/src/lib.rs +++ b/liana/src/lib.rs @@ -827,8 +827,6 @@ mod tests { bitcoin_config, bitcoin_backend: Some(config::BitcoinBackend::Bitcoind(bitcoind_config)), data_dir: Some(data_dir), - #[cfg(unix)] - daemon: false, log_level: log::LevelFilter::Debug, main_descriptor: desc, }; diff --git a/liana/src/testutils.rs b/liana/src/testutils.rs index 123a661c..d7d7c679 100644 --- a/liana/src/testutils.rs +++ b/liana/src/testutils.rs @@ -569,8 +569,6 @@ impl DummyLiana { bitcoin_config, bitcoin_backend: None, data_dir: Some(data_dir), - #[cfg(unix)] - daemon: false, log_level: log::LevelFilter::Debug, main_descriptor: desc, }; diff --git a/tests/test_framework/lianad.py b/tests/test_framework/lianad.py index 4bc5a84f..94bf2305 100644 --- a/tests/test_framework/lianad.py +++ b/tests/test_framework/lianad.py @@ -50,7 +50,6 @@ class Lianad(TailableProc): with open(self.conf_file, "w") as f: f.write(f"data_dir = '{datadir}'\n") - f.write("daemon = false\n") f.write(f"log_level = '{LOG_LEVEL}'\n") f.write(f'main_descriptor = "{multi_desc}"\n')