From 60ee667f6c0260053cc2c4dfb7c30c390e5a8390 Mon Sep 17 00:00:00 2001 From: jp1ac4 <121959000+jp1ac4@users.noreply.github.com> Date: Thu, 10 Aug 2023 15:53:59 +0100 Subject: [PATCH 1/2] bitcoind: make `BitcoinD` public This is so that it can be used by the GUI for checking connectivity to bitcoind. --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index d0e61392a..be6e1cf22 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,11 +15,11 @@ mod testutils; pub use bip39; pub use miniscript; -pub use crate::bitcoin::d::{BitcoindError, WalletError}; +pub use crate::bitcoin::d::{BitcoinD, BitcoindError, WalletError}; #[cfg(feature = "daemon")] use crate::jsonrpc::server::{rpcserver_loop, rpcserver_setup}; use crate::{ - bitcoin::{d::BitcoinD, poller, BitcoinInterface}, + bitcoin::{poller, BitcoinInterface}, config::Config, database::{ sqlite::{FreshDbOptions, SqliteDb, SqliteDbError}, From 3372a8d461f1b06cff08d913b45328e3dcd75da7 Mon Sep 17 00:00:00 2001 From: jp1ac4 <121959000+jp1ac4@users.noreply.github.com> Date: Fri, 11 Aug 2023 12:37:17 +0100 Subject: [PATCH 2/2] bitcoind: add `stop` method This is required by the GUI for stopping an internal bitcoind when closing Liana. --- src/bitcoin/d/mod.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/bitcoin/d/mod.rs b/src/bitcoin/d/mod.rs index bc4a89be3..9f0115902 100644 --- a/src/bitcoin/d/mod.rs +++ b/src/bitcoin/d/mod.rs @@ -1096,6 +1096,11 @@ impl BitcoinD { } } } + + /// Stop bitcoind. + pub fn stop(&self) { + self.make_node_request("stop", &[]); + } } /// An entry in the 'listdescriptors' result.