Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bitcoind-tests: Bump version of corepc-node #782

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

bitcoind-tests: Bump version of corepc-node #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
20 changes: 11 additions & 9 deletions bitcoind-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions bitcoind-tests/tests/setup/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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();
Expand Down
Loading