From 6cd2e4d4e48a7a8fd00793f31cdea6ab9a4b33aa Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Mon, 17 Nov 2025 12:50:07 +1100 Subject: [PATCH 1/3] bitcoind_tests: Upgrade corepc-node version Upgrade to the `v0.10` release of the `corepc` stack. Only test latest point release of each version of Core. `corepc` supports all point releases for the latest 3 version of Core but I'm not convinced there is any benefit testing all of them here. --- .github/workflows/rust.yml | 14 +++++--------- bitcoind-tests/Cargo.toml | 16 ++++++---------- bitcoind-tests/tests/setup/mod.rs | 4 ++-- 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5c2097b1a..9cee73177 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -223,23 +223,19 @@ jobs: matrix: feature: [ - "26_0", + "29_0", + "28_2", + "27_2", + "26_2", "25_2", - "25_1", - "25_0", "24_2", - "24_1", - "24_0_1", "23_2", - "23_1", - "23_0", "22_1", - "22_0", "0_21_2", "0_20_2", "0_19_1", "0_18_1", - "0_17_1", + "0_17_2", ] steps: - name: "Checkout repo" diff --git a/bitcoind-tests/Cargo.toml b/bitcoind-tests/Cargo.toml index 02450bb1f..d2a87c2ec 100644 --- a/bitcoind-tests/Cargo.toml +++ b/bitcoind-tests/Cargo.toml @@ -9,26 +9,22 @@ publish = false [dependencies] miniscript = {path = "../"} -bitcoind = { package = "corepc-node", version = "0.4.0", default-features = false } +bitcoind = { package = "corepc-node", version = "0.10.0", default-features = false } actual-rand = { package = "rand", version = "0.8.4"} secp256k1 = {version = "0.29.0", features = ["rand-std"]} [features] # Enable the same feature in `bitcoind`. -"26_0" = ["bitcoind/26_0"] +"29_0" = ["bitcoind/29_0"] +"28_2" = ["bitcoind/28_2"] +"27_2" = ["bitcoind/27_2"] +"26_2" = ["bitcoind/26_2"] "25_2" = ["bitcoind/25_2"] -"25_1" = ["bitcoind/25_1"] -"25_0" = ["bitcoind/25_0"] "24_2" = ["bitcoind/24_2"] -"24_1" = ["bitcoind/24_1"] -"24_0_1" = ["bitcoind/24_0_1"] "23_2" = ["bitcoind/23_2"] -"23_1" = ["bitcoind/23_1"] -"23_0" = ["bitcoind/23_0"] "22_1" = ["bitcoind/22_1"] -"22_0" = ["bitcoind/22_0"] "0_21_2" = ["bitcoind/0_21_2"] "0_20_2" = ["bitcoind/0_20_2"] "0_19_1" = ["bitcoind/0_19_1"] "0_18_1" = ["bitcoind/0_18_1"] -"0_17_1" = ["bitcoind/0_17_1"] +"0_17_2" = ["bitcoind/0_17_2"] diff --git a/bitcoind-tests/tests/setup/mod.rs b/bitcoind-tests/tests/setup/mod.rs index 90d45eeaa..d2e843aca 100644 --- a/bitcoind-tests/tests/setup/mod.rs +++ b/bitcoind-tests/tests/setup/mod.rs @@ -5,7 +5,7 @@ use bitcoind::client::bitcoin; pub mod test_util; // Launch an instance of bitcoind with -pub fn setup() -> bitcoind::BitcoinD { +pub fn setup() -> bitcoind::Node { // Create env var BITCOIND_EXE_PATH to point to the ../bitcoind/bin/bitcoind binary let key = "BITCOIND_EXE"; if std::env::var(key).is_err() { @@ -24,7 +24,7 @@ pub fn setup() -> bitcoind::BitcoinD { } let exe_path = bitcoind::exe_path().unwrap(); - let bitcoind = bitcoind::BitcoinD::new(exe_path).unwrap(); + let bitcoind = bitcoind::Node::new(exe_path).unwrap(); let cl = &bitcoind.client; // generate to an address by the wallet. And wait for funds to mature let addr = cl.new_address().unwrap(); From 018926ce982beaf7e8d8eb04b6b006a6b25a2ee8 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Mon, 17 Nov 2025 13:05:25 +1100 Subject: [PATCH 2/3] Remove unnecessary parenthesis Found by clippy, clear the lint warning as suggested. --- bitcoind-tests/tests/test_desc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoind-tests/tests/test_desc.rs b/bitcoind-tests/tests/test_desc.rs index e09260097..f73906a40 100644 --- a/bitcoind-tests/tests/test_desc.rs +++ b/bitcoind-tests/tests/test_desc.rs @@ -315,7 +315,7 @@ fn find_sks_ms( .iter_pk() .filter_map(|pk| { let i = pks.iter().position(|&x| x.to_public_key() == pk); - i.map(|idx| (sks[idx])) + i.map(|idx| sks[idx]) }) .collect(); sks From 14b9291c2348e1c977cb1cfbc514be208bc86af2 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Mon, 17 Nov 2025 13:06:37 +1100 Subject: [PATCH 3/3] Use to_keypair Remove the deprecated call to `to_inner` and use the suggested `to_keypair` function. --- bitcoind-tests/tests/test_desc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoind-tests/tests/test_desc.rs b/bitcoind-tests/tests/test_desc.rs index f73906a40..15978175f 100644 --- a/bitcoind-tests/tests/test_desc.rs +++ b/bitcoind-tests/tests/test_desc.rs @@ -177,7 +177,7 @@ pub fn test_desc_satisfy( let mut aux_rand = [0u8; 32]; rand::thread_rng().fill_bytes(&mut aux_rand); let schnorr_sig = - secp.sign_schnorr_with_aux_rand(&msg, &internal_keypair.to_inner(), &aux_rand); + secp.sign_schnorr_with_aux_rand(&msg, &internal_keypair.to_keypair(), &aux_rand); psbt.inputs[0].tap_key_sig = Some(taproot::Signature { signature: schnorr_sig, sighash_type }); } else {