liana: remove daemon feature

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"

liana/Cargo.toml

@@ -12,16 +12,12 @@ exclude = [".github/", ".cirrus.yml", "tests/",  "test_data/", "contrib/", "pypr
 [[bin]]
 name = "lianad"
 path = "src/bin/daemon.rs"
-required-features = ["daemon"]
 
 [[bin]]
 name = "liana-cli"
 path = "src/bin/cli.rs"
-required-features = ["daemon"]
 
 [features]
-default = ["daemon"]
-daemon = ["libc"]
 nonblocking_shutdown = []
 
 [dependencies]
@@ -59,9 +55,6 @@ rusqlite = { version = "0.30", features = ["bundled", "unlock_notify"] }
 # To talk to bitcoind
 jsonrpc = { version = "0.17", features = ["minreq_http"], default-features = false }
 
-# Used for daemonization
-libc = { version = "0.2", optional = true }
-
 # Used for generating mnemonics
 getrandom = "0.2"
 

liana/src/bin/daemon.rs

@@ -80,12 +80,7 @@ fn main() {
         process::exit(1);
     });
 
-    let handle = DaemonHandle::start_default(
-        config,
-        #[cfg(all(unix, feature = "daemon"))]
-        true,
-    )
-    .unwrap_or_else(|e| {
+    let handle = DaemonHandle::start_default(config, cfg!(unix)).unwrap_or_else(|e| {
         log::error!("Error starting Liana daemon: {}", e);
         process::exit(1);
     });

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<PathBuf>,
-    /// 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::<Config>(&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/"
 

liana/src/jsonrpc/api.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{CoinStatus, LabelItem},
-    jsonrpc::{Error, Params, Request, Response},
+    jsonrpc::rpc::{Error, Params, Request, Response},
     DaemonControl,
 };