/// Finds the signer with lowest ordering for a given id in the container.
pub fn find(&self, id: SignerId) -> Option<&Arc<dyn Signer>> {
- self.0.iter()
+ self.0
+ .iter()
.filter(|(key, _)| key.id == id)
- .min_by(|(k_a, _), (k_b, _)| {
- k_a.cmp(k_b)
- })
+ .min_by(|(k_a, _), (k_b, _)| k_a.cmp(k_b))
.map(|(_, v)| v)
}
}
mod signers_container_tests {
use super::*;
use crate::descriptor;
- use miniscript::ScriptContext;
+ use crate::descriptor::ToWalletDescriptor;
use crate::keys::{DescriptorKey, ToDescriptorKey};
- use bitcoin::util::bip32;
use bitcoin::secp256k1::All;
- use std::str::FromStr;
- use crate::descriptor::ToWalletDescriptor;
- use bitcoin::Network;
+ use bitcoin::util::bip32;
use bitcoin::util::psbt::PartiallySignedTransaction;
+ use bitcoin::Network;
+ use miniscript::ScriptContext;
+ use std::str::FromStr;
// Signers added with the same ordering (like `Ordering::default`) created from `KeyMap`
// should be preserved and not overwritten.
let signer2 = Arc::new(DummySigner);
let signer3 = Arc::new(DummySigner);
- signers.add_external(SignerId::Fingerprint(b"cafe"[..].into()), SignerOrdering(1), signer1.clone());
- signers.add_external(SignerId::Fingerprint(b"babe"[..].into()), SignerOrdering(2), signer2.clone());
- signers.add_external(SignerId::Fingerprint(b"feed"[..].into()), SignerOrdering(3), signer3.clone());
+ signers.add_external(
+ SignerId::Fingerprint(b"cafe"[..].into()),
+ SignerOrdering(1),
+ signer1.clone(),
+ );
+ signers.add_external(
+ SignerId::Fingerprint(b"babe"[..].into()),
+ SignerOrdering(2),
+ signer2.clone(),
+ );
+ signers.add_external(
+ SignerId::Fingerprint(b"feed"[..].into()),
+ SignerOrdering(3),
+ signer3.clone(),
+ );
// Check that signers are sorted from lowest to highest ordering
let signers = signers.signers();
signers.add_external(id2.clone(), SignerOrdering(2), signer2.clone());
signers.add_external(id3.clone(), SignerOrdering(3), signer3.clone());
- assert!(matches!(signers.find(id1), Some(signer) if Arc::as_ptr(&signer1) == Arc::as_ptr(signer)));
- assert!(matches!(signers.find(id2), Some(signer) if Arc::as_ptr(&signer2) == Arc::as_ptr(signer)));
- assert!(matches!(signers.find(id3.clone()), Some(signer) if Arc::as_ptr(&signer3) == Arc::as_ptr(signer)));
+ assert!(
+ matches!(signers.find(id1), Some(signer) if Arc::as_ptr(&signer1) == Arc::as_ptr(signer))
+ );
+ assert!(
+ matches!(signers.find(id2), Some(signer) if Arc::as_ptr(&signer2) == Arc::as_ptr(signer))
+ );
+ assert!(
+ matches!(signers.find(id3.clone()), Some(signer) if Arc::as_ptr(&signer3) == Arc::as_ptr(signer))
+ );
// The `signer4` has the same ID as `signer3` but lower ordering.
// It should be found by `id3` instead of `signer3`.
signers.add_external(id3.clone(), SignerOrdering(2), signer4.clone());
- assert!(matches!(signers.find(id3), Some(signer) if Arc::as_ptr(&signer4) == Arc::as_ptr(signer)));
+ assert!(
+ matches!(signers.find(id3), Some(signer) if Arc::as_ptr(&signer4) == Arc::as_ptr(signer))
+ );
// Can't find anything with ID that doesn't exist
assert!(matches!(signers.find(id_nonexistent), None));
#[derive(Debug)]
struct DummySigner;
impl Signer for DummySigner {
- fn sign(&self, _psbt: &mut PartiallySignedTransaction, _input_index: Option<usize>, _secp: &SecpCtx) -> Result<(), SignerError> {
+ fn sign(
+ &self,
+ _psbt: &mut PartiallySignedTransaction,
+ _input_index: Option<usize>,
+ _secp: &SecpCtx,
+ ) -> Result<(), SignerError> {
Ok(())
}
(prvkey, pubkey, fingerprint)
}
-}
\ No newline at end of file
+}