From c4084b91fba9383183add9e7ffb8df166c5ce2c9 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Tue, 25 Oct 2022 22:04:38 +0000
Subject: [PATCH] Fix broken build due to conflict between #1340 and #999

I will test merge commits more thoroughly before signing off on them in future, sorry.
---
 bitcoin/examples/taproot-psbt.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bitcoin/examples/taproot-psbt.rs b/bitcoin/examples/taproot-psbt.rs
index 2734970e..2ab15b66 100644
--- a/bitcoin/examples/taproot-psbt.rs
+++ b/bitcoin/examples/taproot-psbt.rs
@@ -90,13 +90,13 @@ use bitcoin::secp256k1::{Message, Secp256k1};
 use bitcoin::util::bip32::{
     ChildNumber, DerivationPath, ExtendedPrivKey, ExtendedPubKey, Fingerprint,
 };
-use bitcoin::util::sighash;
+use bitcoin::sighash::{self, SighashCache, SchnorrSighashType};
 use bitcoin::util::taproot::{
     LeafVersion, TapLeafHash, TapSighashHash, TaprootBuilder, TaprootSpendInfo,
 };
 use bitcoin::{
-    absolute, script, Address, Amount, OutPoint, SchnorrSig, SchnorrSighashType, Script,
-    SighashCache, Transaction, TxIn, TxOut, Txid, Witness, XOnlyPublicKey,
+    absolute, script, Address, Amount, OutPoint, SchnorrSig, Script,
+    Transaction, TxIn, TxOut, Txid, Witness, XOnlyPublicKey,
 };
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -276,7 +276,7 @@ fn generate_bip86_key_spend_tx(
             let hash_ty = input
                 .sighash_type
                 .and_then(|psbt_sighash_type| psbt_sighash_type.schnorr_hash_ty().ok())
-                .unwrap_or(bitcoin::SchnorrSighashType::All);
+                .unwrap_or(SchnorrSighashType::All);
             let hash = SighashCache::new(&unsigned_tx).taproot_key_spend_signature_hash(
                 vout,
                 &sighash::Prevouts::All(&[TxOut {
@@ -649,7 +649,7 @@ impl BeneficiaryWallet {
             let secret_key =
                 self.master_xpriv.derive_priv(&self.secp, &derivation_path)?.to_priv().inner;
             for lh in leaf_hashes {
-                let hash_ty = bitcoin::SchnorrSighashType::All;
+                let hash_ty = SchnorrSighashType::All;
                 let hash = SighashCache::new(&unsigned_tx).taproot_script_spend_signature_hash(
                     0,
                     &sighash::Prevouts::All(&[TxOut {