Fix CI: rustfmt formatting and integration test for no-wildcard change

- Fix rustfmt issues in key.rs, mod.rs caught by nightly formatter
- Use into_definite() instead of at_derivation_index(0) in test_cpp.rs
  since descriptors built from parse_insane_ms have no wildcard

Author: febyeji

bitcoind-tests/tests/test_cpp.rs

@@ -30,7 +30,7 @@ pub(crate) fn parse_miniscripts(pubdata: &PubData) -> Vec<Descriptor<DefiniteDes
     for line in read_lines("tests/data/random_ms.txt") {
         let ms = test_util::parse_insane_ms(&line.unwrap(), pubdata);
         let wsh = Descriptor::new_wsh(ms).unwrap();
-        desc_vec.push(wsh.at_derivation_index(0).unwrap());
+        desc_vec.push(wsh.into_definite().unwrap());
     }
     desc_vec
 }

bitcoind-tests/tests/test_desc.rs

@@ -85,10 +85,13 @@ pub fn test_desc_satisfy(
         .unwrap();
     assert_eq!(blocks.0.len(), 1);
 
-    let definite_desc = test_util::parse_test_desc(descriptor, &testdata.pubdata)
-        .map_err(|_| DescError::DescParseError)?
-        .at_derivation_index(0)
-        .unwrap();
+    let desc = test_util::parse_test_desc(descriptor, &testdata.pubdata)
+        .map_err(|_| DescError::DescParseError)?;
+    let definite_desc = if desc.has_wildcard() {
+        desc.at_derivation_index(0).unwrap()
+    } else {
+        desc.into_definite().unwrap()
+    };
 
     let derived_desc = definite_desc.derived_descriptor(&secp);
     let desc_address = derived_desc.address(bitcoin::Network::Regtest);
@@ -444,10 +447,13 @@ fn test_plan_satisfy(
         .unwrap();
     assert_eq!(blocks.0.len(), 1);
 
-    let definite_desc = test_util::parse_test_desc(descriptor, &testdata.pubdata)
-        .map_err(|_| DescError::DescParseError)?
-        .at_derivation_index(0)
-        .unwrap();
+    let desc = test_util::parse_test_desc(descriptor, &testdata.pubdata)
+        .map_err(|_| DescError::DescParseError)?;
+    let definite_desc = if desc.has_wildcard() {
+        desc.at_derivation_index(0).unwrap()
+    } else {
+        desc.into_definite().unwrap()
+    };
 
     let derived_desc = definite_desc.derived_descriptor(&secp);
     let desc_address = derived_desc

src/descriptor/key.rs

@@ -369,9 +369,9 @@ impl fmt::Display for NonDefiniteKeyError {
             Self::HardenedStep => {
                 f.write_str("key with hardened derivation steps cannot be a DerivedDescriptorKey")
             }
-            Self::NoWildcard => {
-                f.write_str("descriptor does not have a wildcard, so at_derivation_index does not apply")
-            }
+            Self::NoWildcard => f.write_str(
+                "descriptor does not have a wildcard, so at_derivation_index does not apply",
+            ),
         }
     }
 }

src/descriptor/mod.rs

@@ -686,9 +686,7 @@ impl Descriptor<DescriptorPublicKey> {
     /// # Errors
     /// - If the descriptor contains wildcards
     /// - If the descriptor contains multi-path derivations
-    pub fn into_definite(
-        &self,
-    ) -> Result<Descriptor<DefiniteDescriptorKey>, NonDefiniteKeyError> {
+    pub fn into_definite(&self) -> Result<Descriptor<DefiniteDescriptorKey>, NonDefiniteKeyError> {
         if self.has_wildcard() {
             return Err(NonDefiniteKeyError::Wildcard);
         }
@@ -1958,14 +1956,18 @@ mod tests {
                 "wsh(sortedmulti(1,xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB,xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH))#7etm7zk7",
                 "wsh(sortedmulti(1,xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH,xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB))#ppmeel9k",
             ];
-            let addr_expected =
-                bitcoin::Address::from_str("bc1qpq2cfgz5lktxzr5zqv7nrzz46hsvq3492ump9pz8rzcl8wqtwqcspx5y6a")
-                    .unwrap()
-                    .assume_checked();
+            let addr_expected = bitcoin::Address::from_str(
+                "bc1qpq2cfgz5lktxzr5zqv7nrzz46hsvq3492ump9pz8rzcl8wqtwqcspx5y6a",
+            )
+            .unwrap()
+            .assume_checked();
             for desc_str in desc_strs {
                 let desc = Descriptor::<DefiniteDescriptorKey>::from_str(desc_str).unwrap();
                 assert_eq!(desc.to_string(), desc_str);
-                let addr = desc.derived_descriptor(&secp_ctx).address(bitcoin::Network::Bitcoin).unwrap();
+                let addr = desc
+                    .derived_descriptor(&secp_ctx)
+                    .address(bitcoin::Network::Bitcoin)
+                    .unwrap();
                 assert_eq!(addr, addr_expected);
             }
         }
@@ -2775,10 +2777,7 @@ pk(03f28773c2d975288bc7d1d205c3748651b075fbc6610e58cddeeddf8f19405aa8))";
             "wpkh(xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8/1/2)"
         ).unwrap();
         assert!(!desc.has_wildcard());
-        assert!(matches!(
-            desc.at_derivation_index(0),
-            Err(NonDefiniteKeyError::NoWildcard)
-        ));
+        assert!(matches!(desc.at_derivation_index(0), Err(NonDefiniteKeyError::NoWildcard)));
     }
 
     #[test]