Skip to content

Commit 6cd2e4d

Browse files
committed
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.
1 parent 83a5214 commit 6cd2e4d

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

.github/workflows/rust.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -223,23 +223,19 @@ jobs:
223223
matrix:
224224
feature:
225225
[
226-
"26_0",
226+
"29_0",
227+
"28_2",
228+
"27_2",
229+
"26_2",
227230
"25_2",
228-
"25_1",
229-
"25_0",
230231
"24_2",
231-
"24_1",
232-
"24_0_1",
233232
"23_2",
234-
"23_1",
235-
"23_0",
236233
"22_1",
237-
"22_0",
238234
"0_21_2",
239235
"0_20_2",
240236
"0_19_1",
241237
"0_18_1",
242-
"0_17_1",
238+
"0_17_2",
243239
]
244240
steps:
245241
- name: "Checkout repo"

bitcoind-tests/Cargo.toml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,22 @@ publish = false
99

1010
[dependencies]
1111
miniscript = {path = "../"}
12-
bitcoind = { package = "corepc-node", version = "0.4.0", default-features = false }
12+
bitcoind = { package = "corepc-node", version = "0.10.0", default-features = false }
1313
actual-rand = { package = "rand", version = "0.8.4"}
1414
secp256k1 = {version = "0.29.0", features = ["rand-std"]}
1515

1616
[features]
1717
# Enable the same feature in `bitcoind`.
18-
"26_0" = ["bitcoind/26_0"]
18+
"29_0" = ["bitcoind/29_0"]
19+
"28_2" = ["bitcoind/28_2"]
20+
"27_2" = ["bitcoind/27_2"]
21+
"26_2" = ["bitcoind/26_2"]
1922
"25_2" = ["bitcoind/25_2"]
20-
"25_1" = ["bitcoind/25_1"]
21-
"25_0" = ["bitcoind/25_0"]
2223
"24_2" = ["bitcoind/24_2"]
23-
"24_1" = ["bitcoind/24_1"]
24-
"24_0_1" = ["bitcoind/24_0_1"]
2524
"23_2" = ["bitcoind/23_2"]
26-
"23_1" = ["bitcoind/23_1"]
27-
"23_0" = ["bitcoind/23_0"]
2825
"22_1" = ["bitcoind/22_1"]
29-
"22_0" = ["bitcoind/22_0"]
3026
"0_21_2" = ["bitcoind/0_21_2"]
3127
"0_20_2" = ["bitcoind/0_20_2"]
3228
"0_19_1" = ["bitcoind/0_19_1"]
3329
"0_18_1" = ["bitcoind/0_18_1"]
34-
"0_17_1" = ["bitcoind/0_17_1"]
30+
"0_17_2" = ["bitcoind/0_17_2"]

bitcoind-tests/tests/setup/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use bitcoind::client::bitcoin;
55
pub mod test_util;
66

77
// Launch an instance of bitcoind with
8-
pub fn setup() -> bitcoind::BitcoinD {
8+
pub fn setup() -> bitcoind::Node {
99
// Create env var BITCOIND_EXE_PATH to point to the ../bitcoind/bin/bitcoind binary
1010
let key = "BITCOIND_EXE";
1111
if std::env::var(key).is_err() {
@@ -24,7 +24,7 @@ pub fn setup() -> bitcoind::BitcoinD {
2424
}
2525

2626
let exe_path = bitcoind::exe_path().unwrap();
27-
let bitcoind = bitcoind::BitcoinD::new(exe_path).unwrap();
27+
let bitcoind = bitcoind::Node::new(exe_path).unwrap();
2828
let cl = &bitcoind.client;
2929
// generate to an address by the wallet. And wait for funds to mature
3030
let addr = cl.new_address().unwrap();

0 commit comments

Comments
 (0)