fix(compile-tr): review edits

Author: va-an

src/handlers.rs

@@ -1039,12 +1039,11 @@ pub(crate) fn handle_compile_subcommand(
             // This ensures the key path is effectively disabled and only script path can be used.
             // See https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki#constructing-and-spending-taproot-outputs
 
-            // Validate that the NUMS key is a valid XOnlyPublicKey
-            XOnlyPublicKey::from_str(NUMS_UNSPENDABLE_KEY_HEX)
+            let xonly_public_key = XOnlyPublicKey::from_str(NUMS_UNSPENDABLE_KEY_HEX)
                 .map_err(|e| Error::Generic(format!("Invalid NUMS key: {e}")))?;
 
             let tree = TapTree::Leaf(Arc::new(taproot_policy));
-            Descriptor::new_tr(NUMS_UNSPENDABLE_KEY_HEX.to_string(), Some(tree))
+            Descriptor::new_tr(xonly_public_key.to_string(), Some(tree))
         }
         _ => {
             return Err(Error::Generic(
@@ -1354,21 +1353,20 @@ fn readline() -> Result<String, Error> {
     Ok(buffer)
 }
 
-#[cfg(any(
-    feature = "electrum",
-    feature = "esplora",
-    feature = "cbf",
-    feature = "rpc"
-))]
 #[cfg(test)]
 mod test {
-    use bdk_wallet::bitcoin::Psbt;
-
-    use super::is_final;
-    use std::str::FromStr;
-
+    #[cfg(any(
+        feature = "electrum",
+        feature = "esplora",
+        feature = "cbf",
+        feature = "rpc"
+    ))]
     #[test]
     fn test_psbt_is_final() {
+        use super::is_final;
+        use bdk_wallet::bitcoin::Psbt;
+        use std::str::FromStr;
+
         let unsigned_psbt = Psbt::from_str("cHNidP8BAIkBAAAAASWJHzxzyVORV/C3lAynKHVVL7+Rw7/Jj8U9fuvD24olAAAAAAD+////AiBOAAAAAAAAIgAgLzY9yE4jzTFJnHtTjkc+rFAtJ9NB7ENFQ1xLYoKsI1cfqgKVAAAAACIAIFsbWgDeLGU8EA+RGwBDIbcv4gaGG0tbEIhDvwXXa/E7LwEAAAABALUCAAAAAAEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////BALLAAD/////AgD5ApUAAAAAIgAgWxtaAN4sZTwQD5EbAEMhty/iBoYbS1sQiEO/Bddr8TsAAAAAAAAAACZqJKohqe3i9hw/cdHe/T+pmd+jaVN1XGkGiXmZYrSL69g2l06M+QEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQErAPkClQAAAAAiACBbG1oA3ixlPBAPkRsAQyG3L+IGhhtLWxCIQ78F12vxOwEFR1IhA/JV2U/0pXW+iP49QcsYilEvkZEd4phmDM8nV8wC+MeDIQLKhV/gEZYmlsQXnsL5/Uqv5Y8O31tmWW1LQqIBkiqzCVKuIgYCyoVf4BGWJpbEF57C+f1Kr+WPDt9bZlltS0KiAZIqswkEboH3lCIGA/JV2U/0pXW+iP49QcsYilEvkZEd4phmDM8nV8wC+MeDBDS6ZSEAACICAsqFX+ARliaWxBeewvn9Sq/ljw7fW2ZZbUtCogGSKrMJBG6B95QiAgPyVdlP9KV1voj+PUHLGIpRL5GRHeKYZgzPJ1fMAvjHgwQ0umUhAA==").unwrap();
         assert!(is_final(&unsigned_psbt).is_err());
 
@@ -1385,14 +1383,9 @@ mod test {
         use super::{NUMS_UNSPENDABLE_KEY_HEX, handle_compile_subcommand};
         use bdk_wallet::bitcoin::Network;
 
-        // Expected taproot descriptors with checksums
-        const EXPECTED_PK_A: &str =
-            "tr(50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0,pk(A))#a2mlskt0";
-        const EXPECTED_AND_AB: &str = "tr(50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0,and_v(v:pk(A),pk(B)))#sfplm6kv";
-
-        // Verify our test expectations use the same NUMS key
-        assert!(EXPECTED_PK_A.contains(NUMS_UNSPENDABLE_KEY_HEX));
-        assert!(EXPECTED_AND_AB.contains(NUMS_UNSPENDABLE_KEY_HEX));
+        // Expected taproot descriptors with checksums (using NUMS key from constant)
+        let expected_pk_a = format!("tr({},pk(A))#a2mlskt0", NUMS_UNSPENDABLE_KEY_HEX);
+        let expected_and_ab = format!("tr({},and_v(v:pk(A),pk(B)))#sfplm6kv", NUMS_UNSPENDABLE_KEY_HEX);
 
         // Test simple pk policy compilation to taproot
         let result = handle_compile_subcommand(
@@ -1405,7 +1398,7 @@ mod test {
         let json_string = result.unwrap();
         let json_result: serde_json::Value = serde_json::from_str(&json_string).unwrap();
         let descriptor = json_result.get("descriptor").unwrap().as_str().unwrap();
-        assert_eq!(descriptor, EXPECTED_PK_A);
+        assert_eq!(descriptor, expected_pk_a);
 
         // Test more complex policy
         let result = handle_compile_subcommand(
@@ -1418,7 +1411,7 @@ mod test {
         let json_string = result.unwrap();
         let json_result: serde_json::Value = serde_json::from_str(&json_string).unwrap();
         let descriptor = json_result.get("descriptor").unwrap().as_str().unwrap();
-        assert_eq!(descriptor, EXPECTED_AND_AB);
+        assert_eq!(descriptor, expected_and_ab);
     }
 
     #[cfg(feature = "compiler")]