Skip to content

Commit 6042fd4

Browse files
committed
Merge #44: Use downloaded elementsd(22.1) and bitcoind (24.0.1)
1beba09 Use downloaded elementsd(22.1) and bitcoind (24.0.1) (sanket1729) Pull request description: ACKs for top commit: apoelstra: ACK 1beba09 Tree-SHA512: db32f61b208ac1d24a3f5ce22c09a28b89e3e46d3dc581fc046e0687c20cd8d0736629ce8004afd45ac6912cefd5c09e2cc25bd35c8e4c85cbbd927d12ed9c83
2 parents dc1f5ee + 1beba09 commit 6042fd4

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

bitcoind-tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ edition = "2018"
88

99
[dependencies]
1010
elements-miniscript = {path = "../"}
11-
elementsd = {version = "0.6.0", features=["0_21_0","bitcoind_22_0"]}
11+
elementsd = {version = "0.6.0"}
1212
actual-rand = { package = "rand", version = "0.8.4"}
1313
secp256k1 = {version = "0.24.0", features = ["rand-std"]}

bitcoind-tests/bin/bitcoind

14.6 MB
Binary file not shown.

bitcoind-tests/bin/elementsd

14.9 MB
Binary file not shown.

bitcoind-tests/tests/setup/mod.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ pub mod test_util;
1616
// We are not using pegins right now, but it might be required in case in future
1717
// if we extend the tests to check pegins etc.
1818
pub fn setup(validate_pegin: bool) -> (ElementsD, Option<BitcoinD>, elements::BlockHash) {
19+
// Lookup bitcoind binary path
20+
let curr_dir = std::env::current_dir().unwrap();
21+
let bitcoind_path = curr_dir.clone().join("bin/bitcoind");
22+
let elementsd_path = curr_dir.clone().join("bin/elementsd");
23+
24+
std::env::set_var("BITCOIND_EXE", bitcoind_path);
25+
std::env::set_var("ELEMENTSD_EXE", elementsd_path);
26+
1927
let mut bitcoind = None;
2028
if validate_pegin {
2129
let bitcoind_exe = bitcoind::exe_path().unwrap();

0 commit comments

Comments
 (0)