Make corepc-node optional in payjoin-test-utils

Add a bitcoind feature flag to gate corepc-node dependency and
move bitcoind helpers behind #[cfg(feature = "bitcoind")].
Downstream crates opt in via features = ["bitcoind"].

Author: DanGould

payjoin-cli/Cargo.toml

@@ -55,5 +55,5 @@ url = { version = "2.5.4", features = ["serde"] }
 
 [dev-dependencies]
 nix = { version = "0.30.1", features = ["aio", "process", "signal"] }
-payjoin-test-utils = { version = "0.0.1" }
+payjoin-test-utils = { version = "0.0.1", features = ["bitcoind"] }
 tempfile = "3.20.0"

payjoin-ffi/Cargo.toml

@@ -9,7 +9,7 @@ exclude = ["tests"]
 default = []
 csharp = ["dep:uniffi-bindgen-cs"]
 dart = ["dep:uniffi-dart"]
-_test-utils = ["payjoin-test-utils", "tokio"]
+_test-utils = ["payjoin-test-utils", "payjoin-test-utils/bitcoind", "tokio"]
 _manual-tls = ["payjoin/_manual-tls"]
 wasm_js = ["getrandom/js"]
 

payjoin-ffi/javascript/test-utils/Cargo.toml

@@ -14,6 +14,7 @@ tokio = { version = "1.47.1", features = ["full"] }
 
 [dependencies.payjoin-test-utils]
 path = "../../../payjoin-test-utils"
+features = ["bitcoind"]
 
 [build-dependencies]
 napi-build = "=2.2.4"

payjoin-test-utils/Cargo.toml

@@ -8,10 +8,14 @@ repository = "https://github.com/payjoin/rust-payjoin"
 rust-version = "1.85"
 license = "MIT"
 
+[features]
+default = []
+bitcoind = ["corepc-node"]
+
 [dependencies]
 axum-server = { version = "0.8", features = ["tls-rustls-no-provider"] }
 bitcoin = { version = "0.32.7", features = ["base64"] }
-corepc-node = { version = "0.10.0", features = ["download", "29_0"] }
+corepc-node = { version = "0.10.0", features = ["download", "29_0"], optional = true }
 http = "1.3.1"
 ohttp = { package = "bitcoin-ohttp", version = "0.6.0" }
 once_cell = "1.21.3"

payjoin-test-utils/src/bitcoind.rs

@@ -0,0 +1,72 @@
+use bitcoin::Amount;
+use corepc_node::AddressType;
+use tracing::Level;
+
+use crate::BoxError;
+
+pub fn init_bitcoind() -> Result<corepc_node::Node, BoxError> {
+    let bitcoind_exe = corepc_node::exe_path()?;
+    let mut conf = corepc_node::Conf::default();
+    conf.view_stdout = tracing::enabled!(target: "corepc", Level::TRACE);
+    // conf.args.push("-txindex");
+    let bitcoind = corepc_node::Node::with_conf(bitcoind_exe, &conf)?;
+    Ok(bitcoind)
+}
+
+pub fn init_bitcoind_sender_receiver(
+    sender_address_type: Option<AddressType>,
+    receiver_address_type: Option<AddressType>,
+) -> Result<(corepc_node::Node, corepc_node::Client, corepc_node::Client), BoxError> {
+    let bitcoind = init_bitcoind()?;
+    let mut wallets = create_and_fund_wallets(
+        &bitcoind,
+        vec![("receiver", receiver_address_type), ("sender", sender_address_type)],
+    )?;
+    let receiver = wallets.pop().expect("receiver to exist");
+    let sender = wallets.pop().expect("sender to exist");
+
+    Ok((bitcoind, receiver, sender))
+}
+
+fn create_and_fund_wallets<W: AsRef<str>>(
+    bitcoind: &corepc_node::Node,
+    wallets: Vec<(W, Option<AddressType>)>,
+) -> Result<Vec<corepc_node::Client>, BoxError> {
+    let mut funded_wallets = vec![];
+    let funding_wallet = bitcoind.create_wallet("funding_wallet")?;
+    let funding_address = funding_wallet.new_address()?;
+    // 100 blocks would work here, we add a extra block to cover fees between transfers
+    bitcoind.client.generate_to_address(101 + wallets.len(), &funding_address)?;
+    for (wallet_name, address_type) in wallets {
+        let wallet = bitcoind.create_wallet(wallet_name)?;
+        let address = wallet.get_new_address(None, address_type)?.into_model()?.0.assume_checked();
+        funding_wallet.send_to_address(&address, Amount::from_btc(50.0)?)?;
+        funded_wallets.push(wallet);
+    }
+    // Mine the block which funds the different wallets
+    bitcoind.client.generate_to_address(1, &funding_address)?;
+
+    for wallet in funded_wallets.iter() {
+        let balances = wallet.get_balances()?.into_model()?;
+        assert_eq!(
+            balances.mine.trusted,
+            Amount::from_btc(50.0)?,
+            "wallet doesn't have expected amount of bitcoin"
+        );
+    }
+
+    Ok(funded_wallets)
+}
+
+pub fn init_bitcoind_multi_sender_single_reciever(
+    number_of_senders: usize,
+) -> Result<(corepc_node::Node, Vec<corepc_node::Client>, corepc_node::Client), BoxError> {
+    let bitcoind = init_bitcoind()?;
+    let wallets_to_create =
+        (0..number_of_senders + 1).map(|i| (format!("sender_{i}"), None)).collect::<Vec<_>>();
+    let mut wallets = create_and_fund_wallets(&bitcoind, wallets_to_create)?;
+    let receiver = wallets.pop().expect("receiver to exist");
+    let senders = wallets;
+
+    Ok((bitcoind, senders, receiver))
+}

payjoin-test-utils/src/lib.rs

@@ -4,9 +4,7 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use axum_server::tls_rustls::RustlsConfig;
-use bitcoin::{Amount, Psbt};
-pub use corepc_node; // re-export for convenience
-use corepc_node::AddressType;
+use bitcoin::Psbt;
 use http::StatusCode;
 use ohttp::hpke::{Aead, Kdf, Kem};
 use ohttp::{KeyId, SymmetricSuite};
@@ -19,9 +17,15 @@ use rustls::pki_types::CertificateDer;
 use rustls::RootCertStore;
 use tempfile::tempdir;
 use tokio::task::JoinHandle;
-use tracing::Level;
 use tracing_subscriber::{EnvFilter, FmtSubscriber};
 
+#[cfg(feature = "bitcoind")]
+mod bitcoind;
+#[cfg(feature = "bitcoind")]
+pub use bitcoind::*;
+#[cfg(feature = "bitcoind")]
+pub use corepc_node;
+
 pub type BoxError = Box<dyn std::error::Error + 'static>;
 pub type BoxSendSyncError = Box<dyn std::error::Error + Send + Sync>;
 
@@ -173,77 +177,10 @@ pub fn local_cert_key() -> rcgen::CertifiedKey<rcgen::KeyPair> {
         .expect("Failed to generate cert")
 }
 
-pub fn init_bitcoind() -> Result<corepc_node::Node, BoxError> {
-    let bitcoind_exe = corepc_node::exe_path()?;
-    let mut conf = corepc_node::Conf::default();
-    conf.view_stdout = tracing::enabled!(target: "corepc", Level::TRACE);
-    // conf.args.push("-txindex");
-    let bitcoind = corepc_node::Node::with_conf(bitcoind_exe, &conf)?;
-    Ok(bitcoind)
-}
-
-pub fn init_bitcoind_sender_receiver(
-    sender_address_type: Option<AddressType>,
-    receiver_address_type: Option<AddressType>,
-) -> Result<(corepc_node::Node, corepc_node::Client, corepc_node::Client), BoxError> {
-    let bitcoind = init_bitcoind()?;
-    let mut wallets = create_and_fund_wallets(
-        &bitcoind,
-        vec![("receiver", receiver_address_type), ("sender", sender_address_type)],
-    )?;
-    let receiver = wallets.pop().expect("receiver to exist");
-    let sender = wallets.pop().expect("sender to exist");
-
-    Ok((bitcoind, receiver, sender))
-}
-
-fn create_and_fund_wallets<W: AsRef<str>>(
-    bitcoind: &corepc_node::Node,
-    wallets: Vec<(W, Option<AddressType>)>,
-) -> Result<Vec<corepc_node::Client>, BoxError> {
-    let mut funded_wallets = vec![];
-    let funding_wallet = bitcoind.create_wallet("funding_wallet")?;
-    let funding_address = funding_wallet.new_address()?;
-    // 100 blocks would work here, we add a extra block to cover fees between transfers
-    bitcoind.client.generate_to_address(101 + wallets.len(), &funding_address)?;
-    for (wallet_name, address_type) in wallets {
-        let wallet = bitcoind.create_wallet(wallet_name)?;
-        let address = wallet.get_new_address(None, address_type)?.into_model()?.0.assume_checked();
-        funding_wallet.send_to_address(&address, Amount::from_btc(50.0)?)?;
-        funded_wallets.push(wallet);
-    }
-    // Mine the block which funds the different wallets
-    bitcoind.client.generate_to_address(1, &funding_address)?;
-
-    for wallet in funded_wallets.iter() {
-        let balances = wallet.get_balances()?.into_model()?;
-        assert_eq!(
-            balances.mine.trusted,
-            Amount::from_btc(50.0)?,
-            "wallet doesn't have expected amount of bitcoin"
-        );
-    }
-
-    Ok(funded_wallets)
-}
-
 pub fn http_agent(cert_der: Vec<u8>) -> Result<Client, BoxSendSyncError> {
     Ok(http_agent_builder(cert_der).build()?)
 }
 
-pub fn init_bitcoind_multi_sender_single_reciever(
-    number_of_senders: usize,
-) -> Result<(corepc_node::Node, Vec<corepc_node::Client>, corepc_node::Client), BoxError> {
-    let bitcoind = init_bitcoind()?;
-    let wallets_to_create =
-        (0..number_of_senders + 1).map(|i| (format!("sender_{i}"), None)).collect::<Vec<_>>();
-    let mut wallets = create_and_fund_wallets(&bitcoind, wallets_to_create)?;
-    let receiver = wallets.pop().expect("receiver to exist");
-    let senders = wallets;
-
-    Ok((bitcoind, senders, receiver))
-}
-
 fn http_agent_builder(cert_der: Vec<u8>) -> ClientBuilder {
     ClientBuilder::new().http1_only().use_rustls_tls().add_root_certificate(
         reqwest::tls::Certificate::from_der(cert_der.as_slice())

payjoin/Cargo.toml

@@ -62,7 +62,7 @@ web-time = "1.1.0"
 
 [dev-dependencies]
 once_cell = "1.21.3"
-payjoin-test-utils = { version = "0.0.1" }
+payjoin-test-utils = { version = "0.0.1", features = ["bitcoind"] }
 tokio = { version = "1.47.1", features = ["full"] }
 tracing = "0.1.41"