Cargo: get rid of the jsonrpc_server feature.
It implies daemon. (Also, it needed libc.)
This commit is contained in:
parent
cc88446717
commit
6ea9ba5c1c
@ -12,16 +12,15 @@ exclude = [".github/", ".cirrus.yml", "tests/", "test_data/", "contrib/", "pypr
|
||||
[[bin]]
|
||||
name = "lianad"
|
||||
path = "src/bin/daemon.rs"
|
||||
required-features = ["jsonrpc_server", "daemon"]
|
||||
required-features = ["daemon"]
|
||||
|
||||
[[bin]]
|
||||
name = "liana-cli"
|
||||
path = "src/bin/cli.rs"
|
||||
required-features = ["jsonrpc_server"]
|
||||
required-features = ["daemon"]
|
||||
|
||||
[features]
|
||||
default = ["jsonrpc_server", "daemon"]
|
||||
jsonrpc_server = []
|
||||
default = ["daemon"]
|
||||
daemon = ["libc"]
|
||||
|
||||
[dependencies]
|
||||
|
||||
@ -5,7 +5,7 @@ pub mod config;
|
||||
mod daemonize;
|
||||
mod database;
|
||||
pub mod descriptors;
|
||||
#[cfg(feature = "jsonrpc_server")]
|
||||
#[cfg(feature = "daemon")]
|
||||
mod jsonrpc;
|
||||
mod random;
|
||||
pub mod signer;
|
||||
@ -16,7 +16,7 @@ pub use bip39;
|
||||
pub use miniscript;
|
||||
|
||||
pub use crate::bitcoin::d::{BitcoindError, WalletError};
|
||||
#[cfg(feature = "jsonrpc_server")]
|
||||
#[cfg(feature = "daemon")]
|
||||
use crate::jsonrpc::server::{rpcserver_loop, rpcserver_setup};
|
||||
use crate::{
|
||||
bitcoin::{d::BitcoinD, poller, BitcoinInterface},
|
||||
@ -417,7 +417,7 @@ impl DaemonHandle {
|
||||
|
||||
/// Start the JSONRPC server and listen for incoming commands until we die.
|
||||
/// Like DaemonHandle::shutdown(), this stops the Bitcoin poller at teardown.
|
||||
#[cfg(feature = "jsonrpc_server")]
|
||||
#[cfg(feature = "daemon")]
|
||||
pub fn rpc_server(self) -> Result<(), io::Error> {
|
||||
let DaemonHandle {
|
||||
control,
|
||||
|
||||
@ -416,7 +416,7 @@ impl DummyLiana {
|
||||
DummyLiana { tmp_dir, handle }
|
||||
}
|
||||
|
||||
#[cfg(feature = "jsonrpc_server")]
|
||||
#[cfg(feature = "daemon")]
|
||||
pub fn rpc_server(self) -> Result<(), io::Error> {
|
||||
self.handle.rpc_server()?;
|
||||
fs::remove_dir_all(&self.tmp_dir)?;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user