fix(descriptor): simplify ref handling in ext_check helper functions

Remove redundant references and string conversions in ext_check
implementations for Descriptor types.

Issue: opdrop.add_ext_check

Author: OttoAllmendinger

src/descriptor/mod.rs

@@ -321,17 +321,17 @@ impl<Pk: MiniscriptKey> Descriptor<Pk> {
     /// Helper function for Wsh descriptor
     fn ext_check_wsh(wsh: &Wsh<Pk>, params: &ExtParams) -> Result<(), AnalysisError> {
         match wsh.as_inner() {
-            WshInner::SortedMulti(ref smv) => Ok(()),
+            WshInner::SortedMulti(_) => Ok(()),
             WshInner::Ms(ref ms) => ms.ext_check(params),
         }
     }
 
     /// Helper function for Sh descriptor
     fn ext_check_sh(sh: &Sh<Pk>, params: &ExtParams) -> Result<(), AnalysisError> {
         match sh.as_inner() {
-            ShInner::Wsh(ref wsh) => Self::ext_check_wsh(&wsh, params),
+            ShInner::Wsh(ref wsh) => Self::ext_check_wsh(wsh, params),
             ShInner::Wpkh(_) => Ok(()),
-            ShInner::SortedMulti(ref smv) => Ok(()),
+            ShInner::SortedMulti(_) => Ok(()),
             ShInner::Ms(ref ms) => ms.ext_check(params),
         }
     }
@@ -341,9 +341,9 @@ impl<Pk: MiniscriptKey> Descriptor<Pk> {
         match *self {
             Descriptor::Bare(ref bare) => bare.as_inner().ext_check(params),
             Descriptor::Pkh(_) => Ok(()),
-            Descriptor::Wpkh(ref wpkh) => Ok(()),
-            Descriptor::Wsh(ref wsh) => Self::ext_check_wsh(&wsh, params),
-            Descriptor::Sh(ref sh) => Self::ext_check_sh(&sh, params),
+            Descriptor::Wpkh(_) => Ok(()),
+            Descriptor::Wsh(ref wsh) => Self::ext_check_wsh(wsh, params),
+            Descriptor::Sh(ref sh) => Self::ext_check_sh(sh, params),
             Descriptor::Tr(ref tr) => tr.ext_check(params),
         }
     }

src/miniscript/analyzable.rs

@@ -124,6 +124,7 @@ impl ExtParams {
         self
     }
 
+    /// Builder that allows miniscripts with drop fragments.
     pub fn drop(mut self) -> ExtParams {
         self.drop = true;
         self
@@ -227,6 +228,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
         self.iter().any(|ms| matches!(ms.node, Terminal::RawPkH(_)))
     }
 
+    /// Whether the given miniscript contains a drop fragment
     pub fn contains_drop(&self) -> bool {
         self.iter().any(|ms| matches!(ms.node, Terminal::Drop(_)))
     }

src/miniscript/mod.rs

@@ -1499,7 +1499,7 @@ mod tests {
     fn drop_wrapper() {
         type SwMs = Miniscript<String, Segwitv0>;
         fn assert_error(s: &str, expected_error: Option<&str>) {
-            match SwMs::from_str_insane(&s) {
+            match SwMs::from_str_insane(s) {
                 Ok(_) => match expected_error {
                     Some(e) => {
                         panic!("Expected error: {}", e);

src/miniscript/ms_tests.rs

@@ -23861,7 +23861,5 @@ mod tests {
     #[test]
     pub fn test_opdrop() {
         Miniscript::<String, Segwitv0>::from_str("and_v(v:after(100000),multi(1,A,B))").unwrap();
-        let ms: Miniscript<String, Segwitv0> =
-            Miniscript::from_str("and_v(v:after(100000),multi(1,A,B))").unwrap();
     }
 }

src/psbt/mod.rs

@@ -1729,7 +1729,7 @@ mod tests {
         let xpriv = bip32::Xpriv::new_master(bitcoin::Network::Testnet, &[42]).expect("master key");
         let desc = format!(
             "wsh(and_v(r:after(1024),pk({})))",
-            xpriv.to_keypair(&secp).public_key().to_string()
+            xpriv.to_keypair(&secp).public_key()
         );
         // let desc = format!("wsh(pk({}))", xpriv.to_keypair(&secp).public_key().to_string());
         let desc = Descriptor::<DefiniteDescriptorKey>::from_str(&desc).unwrap();