Skip to content

Refractor WalletRuntime load to Combine wallet DB dir setup and config loading into one function #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emma31-dev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refractor WalletRuntime load to Combine wallet DB dir setup and config loading into one function #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 13 additions & 21 deletions src/utils/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,22 +112,6 @@ 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())
Expand All @@ -154,11 +138,19 @@ pub async fn trace_logger(
}
}

pub fn load_wallet_config(
home_dir: &Path,
/// Prepare wallet database directory and config.
pub fn prepare_wallet_db_dir_and_config(
home_path: &Path,
wallet_name: &str,
) -> Result<(WalletOpts, Network), Error> {
let config = WalletConfig::load(home_dir)?.ok_or(Error::Generic(format!(
) -> 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!(
"No config found for wallet {wallet_name}",
)))?;

Expand All @@ -173,7 +165,7 @@ pub fn load_wallet_config(
let network = Network::from_str(&wallet_config.network)
.map_err(|_| Error::Generic("Invalid network in config".to_string()))?;

Ok((wallet_opts, network))
Ok((dir, wallet_opts, network))
}

#[cfg(feature = "silent-payments")]
Expand Down
9 changes: 3 additions & 6 deletions src/utils/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ use std::{
};

use crate::{
error::BDKCliError as Error,
persister::new_wallet,
utils::{load_wallet_config, prepare_wallet_db_dir},
error::BDKCliError as Error, persister::new_wallet, utils::prepare_wallet_db_dir_and_config,
};
#[cfg(any(feature = "sqlite", feature = "redb"))]
use {
Expand Down Expand Up @@ -76,9 +74,8 @@ pub struct WalletRuntime {

impl WalletRuntime {
pub fn load(home_dir: &Path, wallet_name: &str) -> Result<Self, Error> {
let (wallet_opts, network) = load_wallet_config(home_dir, wallet_name)?;

let database_path = prepare_wallet_db_dir(home_dir, wallet_name)?;
let (database_path, wallet_opts, network) =
prepare_wallet_db_dir_and_config(home_dir, wallet_name)?;

Ok(Self {
wallet_name: wallet_name.to_string(),
Expand Down