Refactor wallet directory and config preparation

Split the combined helper into separate functions for
preparing the wallet database directory and loading wallet
config.

Author: emma31-dev

src/utils/common.rs

@@ -112,6 +112,22 @@ pub(crate) fn prepare_home_dir(home_path: Option<PathBuf>) -> Result<PathBuf, Er
     Ok(dir)
 }
 
+/// Prepare wallet database directory.
+#[allow(dead_code)]
+pub(crate) fn prepare_wallet_db_dir(
+    home_path: &Path,
+    wallet_name: &str,
+) -> Result<std::path::PathBuf, Error> {
+    let mut dir = home_path.to_owned();
+    dir.push(wallet_name);
+
+    if !dir.exists() {
+        std::fs::create_dir(&dir).map_err(|e| Error::Generic(e.to_string()))?;
+    }
+
+    Ok(dir)
+}
+
 pub fn is_mnemonic(s: &str) -> bool {
     let word_count = s.split_whitespace().count();
     (12..=24).contains(&word_count) && s.chars().all(|c| c.is_alphanumeric() || c.is_whitespace())
@@ -138,19 +154,12 @@ pub async fn trace_logger(
     }
 }
 
-/// Prepare wallet database directory and config.
-pub fn prepare_wallet_db_dir_and_config(
-    home_path: &Path,
+/// Prepare wallet database directory.
+pub fn load_wallet_config(
+    home_dir: &Path,
     wallet_name: &str,
-) -> Result<(std::path::PathBuf, WalletOpts, Network), Error> {
-    let mut dir = home_path.to_owned();
-    dir.push(wallet_name);
-
-    if !dir.exists() {
-        std::fs::create_dir(&dir).map_err(|e| Error::Generic(e.to_string()))?;
-    }
-
-    let config = WalletConfig::load(home_path)?.ok_or(Error::Generic(format!(
+) -> Result<(WalletOpts, Network), Error> {
+    let config = WalletConfig::load(home_dir)?.ok_or(Error::Generic(format!(
         "No config found for wallet {wallet_name}",
     )))?;
 
@@ -165,7 +174,7 @@ pub fn prepare_wallet_db_dir_and_config(
     let network = Network::from_str(&wallet_config.network)
         .map_err(|_| Error::Generic("Invalid network in config".to_string()))?;
 
-    Ok((dir, wallet_opts, network))
+    Ok((wallet_opts, network))
 }
 
 #[cfg(feature = "silent-payments")]

src/utils/runtime.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use crate::{
-    error::BDKCliError as Error, persister::new_wallet, utils::prepare_wallet_db_dir_and_config,
+    error::BDKCliError as Error, persister::new_wallet, utils::{prepare_wallet_db_dir, load_wallet_config},
 };
 #[cfg(any(feature = "sqlite", feature = "redb"))]
 use {
@@ -74,8 +74,9 @@ pub struct WalletRuntime {
 
 impl WalletRuntime {
     pub fn load(home_dir: &Path, wallet_name: &str) -> Result<Self, Error> {
-        let (database_path, wallet_opts, network) =
-            prepare_wallet_db_dir_and_config(home_dir, wallet_name)?;
+        let (wallet_opts, network) = load_wallet_config(home_dir, wallet_name)?;
+
+        let database_path = prepare_wallet_db_dir(home_dir, wallet_name)?;
 
         Ok(Self {
             wallet_name: wallet_name.to_string(),