From d739e093f4f3c1d1dac316b33dfc582d1e63e25b Mon Sep 17 00:00:00 2001
From: "Tobin C. Harding" <me@tobin.cc>
Date: Sat, 7 Dec 2024 10:10:01 +1100
Subject: [PATCH] bitcoind-tests: Bump version of corepc-node

Bump the version of `corepc-node`.

Currently this is to test the upcoming release so uses a patch section
in the manifest.

Includes:

- Changed set of version features
  - adds v27 and v28
  - adds all minor versions for versions 26 - 28
  - removes minor versions for versions < 26

- Uses new name `Node` instead of `BitcoinD`
---
 .github/workflows/rust.yml        | 13 ++++++-------
 bitcoind-tests/Cargo.toml         | 20 +++++++++++---------
 bitcoind-tests/tests/setup/mod.rs |  4 ++--
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 0d9aecf74..584299b66 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -197,18 +197,17 @@ jobs:
       matrix:
         feature:
           [
+            "28_0",
+            "27_2",
+            "27_1",
+            "27_0",
+            "26_2",
+            "26_1",
             "26_0",
             "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",
diff --git a/bitcoind-tests/Cargo.toml b/bitcoind-tests/Cargo.toml
index 02450bb1f..8a615de20 100644
--- a/bitcoind-tests/Cargo.toml
+++ b/bitcoind-tests/Cargo.toml
@@ -9,26 +9,28 @@ publish = false
 
 [dependencies]
 miniscript = {path = "../"}
-bitcoind = { package = "corepc-node", version = "0.4.0", default-features = false }
+bitcoind = { package = "corepc-node", version = "0.5.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`.
+# Enable the same feature in `corepc-node`.
+"28_0" = ["bitcoind/28_0"]
+"27_2" = ["bitcoind/27_2"]
+"27_1" = ["bitcoind/27_1"]
+"27_0" = ["bitcoind/27_0"]
+"26_2" = ["bitcoind/26_2"]
+"26_1" = ["bitcoind/26_1"]
 "26_0" = ["bitcoind/26_0"]
 "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"]
+
+[patch.crates-io.corepc-node]
+path = "../../../corepc/12-06-release-0.5.0/node"
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();