feat(multipath): Add unit tests for multipath utils

Author: tvpeter

src/utils.rs

@@ -241,10 +241,9 @@ where
     let ext_descriptor = wallet_opts.ext_descriptor.clone();
     let int_descriptor = wallet_opts.int_descriptor.clone();
 
-    let is_multipath = ext_descriptor.contains('<') && ext_descriptor.contains(';');
-    if is_multipath && int_descriptor.is_some() {
+    if is_multipath_desc(&ext_descriptor) && int_descriptor.is_some() {
         return Err(Error::AmbiguousDescriptors);
-    }
+    };
 
     let mut wallet_load_params = Wallet::load();
     wallet_load_params =
@@ -288,8 +287,7 @@ pub(crate) fn new_wallet(network: Network, wallet_opts: &WalletOpts) -> Result<W
     let ext_descriptor = wallet_opts.ext_descriptor.clone();
     let int_descriptor = wallet_opts.int_descriptor.clone();
 
-    let is_multipath = ext_descriptor.contains('<') && ext_descriptor.contains(';');
-    if is_multipath && int_descriptor.is_some() {
+    if is_multipath_desc(&ext_descriptor) && int_descriptor.is_some() {
         return Err(Error::AmbiguousDescriptors);
     }
 
@@ -658,3 +656,79 @@ pub fn load_wallet_config(
 
     Ok((wallet_opts, network))
 }
+
+/// Helper to check if a descriptor string contains a BIP389 multipath expression.
+fn is_multipath_desc(desc_str: &str) -> bool {
+    let desc_str = desc_str.split('#').next().unwrap_or(desc_str).trim();
+
+    desc_str.contains('<') && desc_str.contains(';') && desc_str.contains('>')
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::commands::WalletOpts;
+    use bdk_wallet::{bitcoin::Network, rusqlite::Connection};
+
+    #[test]
+    fn test_is_multipath_descriptor() {
+        let multipath_desc = "wpkh([9a6a2580/84'/1'/0']tpubDDnGNapGEY6AZAdQbfRJgMg9fvz8pUBrLwvyvUqEgcUfgzM6zc2eVK4vY9x9L5FJWdX8WumXuLEDV5zDZnTfbn87vLe9XceCFwTu9so9Kks/<0;1>/*)";
+        let desc = "wpkh([07234a14/84'/1'/0']tpubDCSgT6PaVLQH9h2TAxKryhvkEurUBcYRJc9dhTcMDyahhWiMWfEWvQQX89yaw7w7XU8bcVujoALfxq59VkFATri3Cxm5mkp9kfHfRFDckEh/0/*)#429nsxmg";
+        let multi_path = is_multipath_desc(multipath_desc);
+        let result = is_multipath_desc(desc);
+        assert!(multi_path);
+        assert!(!result);
+    }
+
+    #[test]
+    fn test_multipath_detection_and_initialization() {
+        let network = Network::Testnet;
+        let multipath_desc = "wpkh([9a6a2580/84'/1'/0']tpubDDnGNapGEY6AZAdQbfRJgMg9fvz8pUBrLwvyvUqEgcUfgzM6zc2eVK4vY9x9L5FJWdX8WumXuLEDV5zDZnTfbn87vLe9XceCFwTu9so9Kks/<0;1>/*)";
+        let mut db = Connection::open_in_memory().expect("should open in memory db");
+
+        let opts = WalletOpts {
+            ext_descriptor: multipath_desc.to_string(),
+            int_descriptor: None,
+            wallet: Some("test_wallet".to_string()),
+            verbose: false,
+            database_type: crate::commands::DatabaseType::Sqlite,
+        };
+
+        let result = new_persisted_wallet(network, &mut db, &opts);
+        assert!(result.is_ok(), "Multipath initialization should succeed");
+
+        let wallet = result.unwrap();
+        let ext_desc = wallet.public_descriptor(KeychainKind::External).to_string();
+        let int_desc = wallet.public_descriptor(KeychainKind::Internal).to_string();
+
+        assert!(ext_desc.contains("/0/*"), "External should use index 0");
+        assert!(int_desc.contains("/1/*"), "Internal should use index 1");
+
+        assert!(ext_desc.contains("9a6a2580"));
+        assert!(int_desc.contains("9a6a2580"));
+    }
+
+    #[test]
+    fn test_error_on_ambiguous_descriptors() {
+        let network = Network::Testnet;
+        let multipath_desc = "wpkh([9a6a2580/84'/1'/0']tpubDDnGNapGEY6AZAdQbfRJgMg9fvz8pUBrLwvyvUqEgcUfgzM6zc2eVK4vY9x9L5FJWdX8WumXuLEDV5zDZnTfbn87vLe9XceCFwTu9so9Kks/<0;1>/*)";
+        let internal_desc = "wpkh([07234a14/84'/1'/0']tpubDCSgT6PaVLQH9h2TAxKryhvkEurUBcYRJc9dhTcMDyahhWiMWfEWvQQX89yaw7w7XU8bcVujoALfxq59VkFATri3Cxm5mkp9kfHfRFDckEh/1/*)#y7qjdnts";
+
+        let mut db = Connection::open_in_memory().expect("should open in memory db");
+
+        let opts = WalletOpts {
+            ext_descriptor: multipath_desc.to_string(),
+            int_descriptor: Some(internal_desc.to_string()),
+            wallet: Some("test_wallet".to_string()),
+            verbose: true,
+            database_type: crate::commands::DatabaseType::Sqlite,
+        };
+
+        let result = new_persisted_wallet(network, &mut db, &opts);
+
+        match result {
+            Err(Error::AmbiguousDescriptors) => (),
+            _ => panic!("Should have returned AmbiguousDescriptors error"),
+        }
+    }
+}