From d15c57bd1f4a3928ae5bfa23118c6d28f21b6b9d Mon Sep 17 00:00:00 2001
From: Nadav Ivgi <nadav@shesek.info>
Date: Fri, 13 Sep 2024 11:35:32 +0300
Subject: [PATCH] Refactor GetKey for sets to internally use Xpriv::get_key()

---
 bitcoin/src/psbt/mod.rs | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/bitcoin/src/psbt/mod.rs b/bitcoin/src/psbt/mod.rs
index 09799f95e..af39d22fb 100644
--- a/bitcoin/src/psbt/mod.rs
+++ b/bitcoin/src/psbt/mod.rs
@@ -803,18 +803,11 @@ impl GetKey for $set<Xpriv> {
         key_request: KeyRequest,
         secp: &Secp256k1<C>
     ) -> Result<Option<PrivateKey>, Self::Error> {
-        match key_request {
-            KeyRequest::Pubkey(_) => Err(GetKeyError::NotSupported),
-            KeyRequest::Bip32((fingerprint, path)) => {
-                for xpriv in self.iter() {
-                    if xpriv.fingerprint(secp) == fingerprint {
-                        let k = xpriv.derive_priv(secp, &path);
-                        return Ok(Some(k.to_priv()));
-                    }
-                }
-                Ok(None)
-            }
-        }
+        // OK to stop at the first error because Xpriv::get_key() can only fail
+        // if this isn't a KeyRequest::Bip32, which would fail for all Xprivs.
+        self.iter()
+            .find_map(|xpriv| xpriv.get_key(key_request.clone(), secp).transpose())
+            .transpose()
     }
 }}}
 impl_get_key_for_set!(BTreeSet);