v0.2.6-pre.005

crates/ksp-app-wallet-desk/src/wallet_inventory.rs

@@ -1,5 +1,5 @@
 // file: crates/ksp-app-wallet-desk/src/wallet_inventory.rs
-// version: 1
+// version: 2
 
 //! Root-scoped Wallet inventory and locked-file selection for Wallet Desk.
 
@@ -134,8 +134,21 @@ pub(crate) async fn list_wallet_inventory(root: &std::path::Path) -> ksp_core_li
 }
 
 /// Re-resolves and re-inspects one selected inventory identifier without exposing its full path.
+#[cfg(test)]
 pub(crate) async fn select_locked_wallet(root: &std::path::Path, request: WalletSelectionRequestDto) -> ksp_core_lib::Result<LockedWalletDto> {
-    let path = resolve_wallet_path(root, request.wallet_id.as_str()).await;
+    let resolved = resolve_locked_wallet(root, request.wallet_id).await;
+    return match resolved {
+        std::result::Result::Ok((_, _, dto)) => std::result::Result::Ok(dto),
+        std::result::Result::Err(error) => std::result::Result::Err(error),
+    };
+}
+
+/// Resolves one locked Wallet into its Rust-only path, locked info and safe DTO.
+pub(crate) async fn resolve_locked_wallet(
+    root: &std::path::Path,
+    wallet_id: String,
+) -> ksp_core_lib::Result<(std::path::PathBuf, ksp_wallet_lib::LockedWalletInfo, LockedWalletDto)> {
+    let path = resolve_wallet_path(root, wallet_id.as_str()).await;
     let path = match path {
         std::result::Result::Ok(value) => value,
         std::result::Result::Err(error) => return std::result::Result::Err(error),
@@ -145,13 +158,22 @@ pub(crate) async fn select_locked_wallet(root: &std::path::Path, request: Wallet
         std::result::Result::Ok(value) => value,
         std::result::Result::Err(error) => return std::result::Result::Err(error),
     };
-    ksp_logging_lib::debug!(target: crate::TRACING_TARGET, domain = crate::TRACING_DOMAIN_WALLET_INVENTORY, wallet_id = request.wallet_id.as_str(), format_version = locked.format_version(), view_enabled = locked.view_enabled(), "Locked Wallet selected from inventory");
-    return std::result::Result::Ok(LockedWalletDto {
-        filename: request.wallet_id.clone(),
+    let dto = LockedWalletDto {
+        filename: wallet_id.clone(),
         format_version: locked.format_version(),
-        wallet_id: request.wallet_id,
+        wallet_id: wallet_id.clone(),
         view_enabled: locked.view_enabled(),
-    });
+    };
+    ksp_logging_lib::debug!(target: crate::TRACING_TARGET, domain = crate::TRACING_DOMAIN_WALLET_INVENTORY, wallet_id = wallet_id.as_str(), format_version = locked.format_version(), view_enabled = locked.view_enabled(), "Locked Wallet selected from inventory");
+    return std::result::Result::Ok((path, locked, dto));
+}
+
+/// Validates a root-scoped destination filename for a new native Wallet.
+pub(crate) fn new_wallet_destination(root: &std::path::Path, filename: &str) -> ksp_core_lib::Result<std::path::PathBuf> {
+    if !is_wallet_filename(filename) {
+        return selection_invalid(filename, "Wallet destination must be one UTF-8 filename ending in .kspwallet");
+    }
+    return std::result::Result::Ok(root.join(filename));
 }
 
 fn valid_inventory_entry(filename: String, locked: ksp_wallet_lib::LockedWalletInfo) -> WalletInventoryEntryDto {