Merge #422: Remove bitcoin rand feature from integration testing

92050de Remove bitcoin rand feature from integration testing (sanket1729)

Pull request description:

  Addresses [feedback ](#420 (comment)) #420 's review

ACKs for top commit:
  apoelstra:
    ACK 92050de
  RCasatta:
    ACK 92050de

Tree-SHA512: ad3dcc3631eb3ffd6de30d577d8a08756cbb4a2ff1670b21f4902422a2104bbfc8b161583a1ba3dd7368160e2dd51bac1d68c9332fc73a3a72d3c6b3ddcdabb4

Author: apoelstra

Cargo.toml

@@ -25,7 +25,6 @@ serde = { version = "1.0", optional = true}
 [dev-dependencies]
 bitcoind = {version = "0.26.1", features=["22_0"]}
 actual-rand = { package = "rand", version = "0.8.4"}
-bitcoin = { version = "0.28", features = ["rand"]}
 
 [[example]]
 name = "htlc"

tests/test_desc.rs

@@ -6,6 +6,7 @@
 
 use std::collections::BTreeMap;
 
+use actual_rand as rand;
 use bitcoin::blockdata::witness::Witness;
 use bitcoin::util::psbt::PartiallySignedTransaction as Psbt;
 use bitcoin::util::sighash::SighashCache;
@@ -18,9 +19,9 @@ use bitcoind::bitcoincore_rpc::{json, Client, RpcApi};
 use miniscript::miniscript::iter;
 use miniscript::psbt::{PsbtExt, PsbtInputExt};
 use miniscript::{Descriptor, Miniscript, MiniscriptKey, ScriptContext, ToPublicKey};
-
 mod setup;
 
+use rand::RngCore;
 use setup::test_util::{self, TestData};
 /// Quickly create a BTC amount.
 fn btc<F: Into<f64>>(btc: F) -> Amount {
@@ -145,7 +146,10 @@ pub fn test_desc_satisfy(cl: &Client, testdata: &TestData, desc: &str) -> Witnes
                     .taproot_key_spend_signature_hash(0, &prevouts, hash_ty)
                     .unwrap();
                 let msg = secp256k1::Message::from_slice(&sighash_msg[..]).unwrap();
-                let schnorr_sig = secp.sign_schnorr(&msg, &internal_keypair);
+                let mut aux_rand = [0u8; 32];
+                rand::thread_rng().fill_bytes(&mut aux_rand);
+                let schnorr_sig =
+                    secp.sign_schnorr_with_aux_rand(&msg, &internal_keypair, &aux_rand);
                 psbt.inputs[0].tap_key_sig = Some(SchnorrSig {
                     sig: schnorr_sig,
                     hash_ty: hash_ty,
@@ -177,7 +181,9 @@ pub fn test_desc_satisfy(cl: &Client, testdata: &TestData, desc: &str) -> Witnes
                     .taproot_script_spend_signature_hash(0, &prevouts, leaf_hash, hash_ty)
                     .unwrap();
                 let msg = secp256k1::Message::from_slice(&sighash_msg[..]).unwrap();
-                let sig = secp.sign_schnorr(&msg, &keypair);
+                let mut aux_rand = [0u8; 32];
+                rand::thread_rng().fill_bytes(&mut aux_rand);
+                let sig = secp.sign_schnorr_with_aux_rand(&msg, &keypair, &aux_rand);
                 // FIXME: uncomment when == is supported for secp256k1::KeyPair. (next major release)
                 // let x_only_pk = pks[xonly_keypairs.iter().position(|&x| x == keypair).unwrap()];
                 // Just recalc public key