Move bitcoind tests to inner crate

This will allow us to have separate test dependacies and test CI only on
stable. Ideally, we would want to have to a conditional dev dependancy
but that is not possible currently

Author: sanket1729

Cargo.toml

@@ -30,10 +30,10 @@ hashbrown = { version = "0.11", optional = true }
 actual-serde = { package = "serde", version = "1.0", optional = true }
 
 [dev-dependencies]
-bitcoind = { version = "0.27.0", features=["23_0"] }
-actual-rand = { package = "rand", version = "0.8.4"}
-secp256k1 = {version = "0.24.0", features = ["rand-std"]}
 serde_test = "1.0.147"
+bitcoin = { version = "0.29.2", features = ["base64"] }
+secp256k1 = {version = "0.24.0", features = ["rand-std"]}
+actual-base64 = { package = "base64", version = "0.13.0" }
 
 [[example]]
 name = "htlc"
@@ -65,4 +65,4 @@ required-features = ["compiler","std"]
 
 [[example]]
 name = "psbt_sign_finalize"
-required-features = ["std"]
+required-features = ["std", "base64"]

bitcoind-tests/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "bitcoind-tests"
+version = "0.1.0"
+authors = ["sanket1729 <[email protected]>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+miniscript = {path = "../"}
+bitcoind = { version = "0.29.3", features=["23_0"] }
+actual-rand = { package = "rand", version = "0.8.4"}
+secp256k1 = {version = "0.24.0", features = ["rand-std"]}

bitcoind-tests/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

tests/data/random_ms.txt renamed to bitcoind-tests/tests/data/random_ms.txt

@@ -19,6 +19,7 @@
 
 use std::str::FromStr;
 
+use miniscript::bitcoin;
 use actual_rand as rand;
 use bitcoin::hashes::hex::ToHex;
 use bitcoin::hashes::{hash160, ripemd160, sha256, Hash};
@@ -29,6 +30,7 @@ use miniscript::{
     Translator,
 };
 use rand::RngCore;
+
 #[derive(Clone, Debug)]
 pub struct PubData {
     pub pks: Vec<bitcoin::PublicKey>,

tests/setup/mod.rs renamed to bitcoind-tests/tests/setup/mod.rs

@@ -13,8 +13,9 @@ use bitcoin::hashes::{sha256d, Hash};
 use bitcoin::secp256k1::{self, Secp256k1};
 use bitcoin::util::psbt;
 use bitcoin::util::psbt::PartiallySignedTransaction as Psbt;
-use bitcoin::{self, Amount, LockTime, OutPoint, Sequence, Transaction, TxIn, TxOut, Txid};
+use bitcoin::{Amount, LockTime, OutPoint, Sequence, Transaction, TxIn, TxOut, Txid};
 use bitcoind::bitcoincore_rpc::{json, Client, RpcApi};
+use miniscript::bitcoin;
 use miniscript::psbt::PsbtExt;
 use miniscript::Descriptor;
 

tests/setup/test_util.rs renamed to bitcoind-tests/tests/setup/test_util.rs

@@ -7,6 +7,7 @@
 use std::collections::BTreeMap;
 use std::{error, fmt};
 
+use miniscript::bitcoin;
 use actual_rand as rand;
 use bitcoin::blockdata::witness::Witness;
 use bitcoin::hashes::{sha256d, Hash};
@@ -15,7 +16,7 @@ use bitcoin::util::sighash::SighashCache;
 use bitcoin::util::taproot::{LeafVersion, TapLeafHash};
 use bitcoin::util::{psbt, sighash};
 use bitcoin::{
-    self, secp256k1, Amount, LockTime, OutPoint, SchnorrSig, Script, Sequence, Transaction, TxIn,
+    secp256k1, Amount, LockTime, OutPoint, SchnorrSig, Script, Sequence, Transaction, TxIn,
     TxOut, Txid,
 };
 use bitcoind::bitcoincore_rpc::{json, Client, RpcApi};

tests/test_cpp.rs renamed to bitcoind-tests/tests/test_cpp.rs

@@ -1,11 +1,10 @@
 use std::collections::BTreeMap;
 use std::str::FromStr;
 
+use actual_base64 as base64;
 use bitcoin::consensus::serialize;
 use bitcoin::util::sighash::SighashCache;
 use bitcoin::{PackedLockTime, PrivateKey};
-use bitcoind::bitcoincore_rpc::jsonrpc::base64;
-use bitcoind::bitcoincore_rpc::RawTx;
 use miniscript::bitcoin::consensus::encode::deserialize;
 use miniscript::bitcoin::hashes::hex::FromHex;
 use miniscript::bitcoin::util::psbt;
@@ -165,7 +164,7 @@ fn main() {
     println!("{:#?}", psbt);
 
     let tx = psbt.extract_tx();
-    println!("{}", tx.raw_hex());
+    println!("{}", bitcoin::consensus::encode::serialize_hex(&tx));
 }
 
 // Find the Outpoint by spk

tests/test_desc.rs renamed to bitcoind-tests/tests/test_desc.rs

@@ -1,12 +1,12 @@
 use std::collections::HashMap;
 use std::str::FromStr;
 
+use bitcoin::secp256k1::{rand, KeyPair};
 use bitcoin::util::address::WitnessVersion;
 use bitcoin::Network;
 use miniscript::descriptor::DescriptorType;
 use miniscript::policy::Concrete;
 use miniscript::{translate_hash_fail, Descriptor, Miniscript, Tap, TranslatePk, Translator};
-use secp256k1::{rand, KeyPair};
 
 // Refer to https://github.com/sanket1729/adv_btc_workshop/blob/master/workshop.md#creating-a-taproot-descriptor
 // for a detailed explanation of the policy and it's compilation