Skip to content

Commit 08f7b62

Browse files
committed
Merge #877: bitcoind_tests: Upgrade corepc-node version
2ae0a10 bitcoind_tests: Upgrade corepc-node version (Tobin C. Harding) Pull request description: 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. Note that `corepc-node` only supports up to Core v29 ACKs for top commit: apoelstra: ACK 2ae0a10; successfully ran local tests Tree-SHA512: 77554dee4f3e10adf97f36fc3bb814bb920859bd4a2e8705e68426e0b5acb52c4feb058faf13fa9220b4e83f11a786a9d5c02745a9619ebb4d70af53f36351f8
2 parents 9b6b9d4 + 2ae0a10 commit 08f7b62

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

.github/workflows/rust.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,25 @@ jobs:
133133
Integration: # 1 job for each bitcoind version we support.
134134
name: Integration tests - stable toolchain
135135
runs-on: ubuntu-latest
136+
strategy:
137+
fail-fast: false
138+
matrix:
139+
feature:
140+
[
141+
"29_0",
142+
"28_2",
143+
"27_2",
144+
"26_2",
145+
"25_2",
146+
"24_2",
147+
"23_2",
148+
"22_1",
149+
"0_21_2",
150+
"0_20_2",
151+
"0_19_1",
152+
"0_18_1",
153+
"0_17_2",
154+
]
136155
steps:
137156
- uses: actions/checkout@v6
138157
- uses: ./.github/actions/prepare

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)