bitcoind-tests: Adapt to Simplicity

These tests silently broke when we changed the tap tree iterator.

Author: uncomputable

bitcoind-tests/tests/test_arith.rs

@@ -5,7 +5,7 @@
 
 use elements::pset::PartiallySignedTransaction as Psbt;
 use elements::sighash::SigHashCache;
-use elements::taproot::{LeafVersion, TapLeafHash};
+use elements::taproot::TapLeafHash;
 use elements::{
     confidential, pset as psbt, secp256k1_zkp as secp256k1, sighash, OutPoint, Script, Sequence,
     TxIn, TxOut, Txid,
@@ -107,9 +107,9 @@ pub fn test_desc_satisfy(cl: &ElementsD, testdata: &TestData, desc: &str) -> Vec
             // ------------------ script spend -------------
             let x_only_keypairs_reqd: Vec<(secp256k1::KeyPair, TapLeafHash)> = tr
                 .iter_scripts()
-                .flat_map(|(_depth, ms)| {
-                    let leaf_hash = TapLeafHash::from_script(&ms.encode(), LeafVersion::default());
-                    ms.iter_pk().filter_map(move |pk| {
+                .flat_map(|(_depth, script)| {
+                    let leaf_hash = TapLeafHash::from_script(&script.encode(), script.version());
+                    script.iter_pk().filter_map(move |pk| {
                         let i = x_only_pks.iter().position(|&x| x.to_public_key() == pk);
                         i.map(|idx| (xonly_keypairs[idx], leaf_hash))
                     })

bitcoind-tests/tests/test_csfs.rs

@@ -5,7 +5,7 @@
 
 use elements::pset::PartiallySignedTransaction as Psbt;
 use elements::sighash::SigHashCache;
-use elements::taproot::{LeafVersion, TapLeafHash};
+use elements::taproot::TapLeafHash;
 use elements::{
     confidential, pset as psbt, secp256k1_zkp as secp256k1, sighash, OutPoint, Script, Sequence,
     TxIn, TxOut, Txid,
@@ -108,9 +108,9 @@ pub fn test_desc_satisfy(cl: &ElementsD, testdata: &TestData, desc: &str) -> Vec
             // ------------------ script spend -------------
             let x_only_keypairs_reqd: Vec<(secp256k1::KeyPair, TapLeafHash)> = tr
                 .iter_scripts()
-                .flat_map(|(_depth, ms)| {
-                    let leaf_hash = TapLeafHash::from_script(&ms.encode(), LeafVersion::default());
-                    ms.iter_pk().filter_map(move |pk| {
+                .flat_map(|(_depth, script)| {
+                    let leaf_hash = TapLeafHash::from_script(&script.encode(), script.version());
+                    script.iter_pk().filter_map(move |pk| {
                         let i = x_only_pks.iter().position(|&x| x.to_public_key() == pk);
                         i.map(|idx| (xonly_keypairs[idx], leaf_hash))
                     })

bitcoind-tests/tests/test_desc.rs

@@ -9,7 +9,7 @@ use std::{error, fmt};
 use elements::hashes::{sha256d, Hash};
 use elements::pset::PartiallySignedTransaction as Psbt;
 use elements::sighash::SigHashCache;
-use elements::taproot::{LeafVersion, TapLeafHash};
+use elements::taproot::TapLeafHash;
 use elements::{
     confidential, pset as psbt, secp256k1_zkp as secp256k1, sighash, OutPoint, SchnorrSig, Script,
     Sequence, TxIn, TxOut, Txid,
@@ -178,9 +178,9 @@ pub fn test_desc_satisfy(
             // ------------------ script spend -------------
             let x_only_keypairs_reqd: Vec<(secp256k1::KeyPair, TapLeafHash)> = tr
                 .iter_scripts()
-                .flat_map(|(_depth, ms)| {
-                    let leaf_hash = TapLeafHash::from_script(&ms.encode(), LeafVersion::default());
-                    ms.iter_pk().filter_map(move |pk| {
+                .flat_map(|(_depth, script)| {
+                    let leaf_hash = TapLeafHash::from_script(&script.encode(), script.version());
+                    script.iter_pk().filter_map(move |pk| {
                         let i = x_only_pks.iter().position(|&x| x.to_public_key() == pk);
                         i.map(|idx| (xonly_keypairs[idx], leaf_hash))
                     })

bitcoind-tests/tests/test_introspect.rs

@@ -5,7 +5,7 @@
 
 use elements::pset::PartiallySignedTransaction as Psbt;
 use elements::sighash::SigHashCache;
-use elements::taproot::{LeafVersion, TapLeafHash};
+use elements::taproot::TapLeafHash;
 use elements::{
     confidential, pset as psbt, secp256k1_zkp as secp256k1, sighash, OutPoint, Script, Sequence,
     TxIn, TxOut, Txid,
@@ -107,9 +107,9 @@ pub fn test_desc_satisfy(cl: &ElementsD, testdata: &TestData, desc: &str) -> Vec
             // ------------------ script spend -------------
             let x_only_keypairs_reqd: Vec<(secp256k1::KeyPair, TapLeafHash)> = tr
                 .iter_scripts()
-                .flat_map(|(_depth, ms)| {
-                    let leaf_hash = TapLeafHash::from_script(&ms.encode(), LeafVersion::default());
-                    ms.iter_pk().filter_map(move |pk| {
+                .flat_map(|(_depth, script)| {
+                    let leaf_hash = TapLeafHash::from_script(&script.encode(), script.version());
+                    script.iter_pk().filter_map(move |pk| {
                         let i = x_only_pks.iter().position(|&x| x.to_public_key() == pk);
                         i.map(|idx| (xonly_keypairs[idx], leaf_hash))
                     })