From ac72e2044754cb84d31daa1e6e7e25f9ec6f9ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Fri, 6 May 2022 09:41:36 +0200
Subject: [PATCH] wallet: additional test for decrypting stored wallet file

---
 .../src/operations/mixnet/account.rs          | 72 +++++++++++++++----
 .../src-tauri/src/wallet_storage/mod.rs       |  6 +-
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/nym-wallet/src-tauri/src/operations/mixnet/account.rs b/nym-wallet/src-tauri/src/operations/mixnet/account.rs
index a9afeb388c..f9481e6f93 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/account.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/account.rs
@@ -4,8 +4,7 @@ use crate::error::BackendError;
 use crate::network::Network as WalletNetwork;
 use crate::nymd_client;
 use crate::state::State;
-use crate::wallet_storage::account_data::StoredLogin;
-use crate::wallet_storage::{self, DEFAULT_WALLET_ACCOUNT_ID};
+use crate::wallet_storage::{self, StoredLogin, DEFAULT_WALLET_ACCOUNT_ID};
 
 use bip39::{Language, Mnemonic};
 use config::defaults::all::Network;
@@ -428,6 +427,20 @@ pub async fn sign_in_with_password(
   let id = wallet_storage::AccountId::new(DEFAULT_WALLET_ACCOUNT_ID.to_string());
   let password = wallet_storage::UserPassword::new(password);
   let stored_account = wallet_storage::load_existing_wallet_login_information(&id, &password)?;
+  let (mnemonic, all_accounts) = extract_mnemonic_and_all_accounts(stored_account, id)?;
+
+  {
+    let mut w_state = state.write().await;
+    w_state.set_all_accounts(all_accounts);
+  }
+
+  _connect_with_mnemonic(mnemonic, state).await
+}
+
+fn extract_mnemonic_and_all_accounts(
+  stored_account: StoredLogin,
+  id: wallet_storage::AccountId,
+) -> Result<(Mnemonic, Vec<wallet_storage::WalletAccount>), BackendError> {
   let mnemonic = match stored_account {
     StoredLogin::Mnemonic(ref account) => account.mnemonic().clone(),
     StoredLogin::Multiple(ref accounts) => {
@@ -442,18 +455,13 @@ pub async fn sign_in_with_password(
     }
   };
 
-  {
-    // Keep track of all accounts for that id
-    let all_accounts: Vec<_> = stored_account
-      .unwrap_into_multiple_accounts(id)
-      .into_accounts()
-      .collect();
+  // Keep track of all accounts for that id
+  let all_accounts: Vec<_> = stored_account
+    .unwrap_into_multiple_accounts(id)
+    .into_accounts()
+    .collect();
 
-    let mut w_state = state.write().await;
-    w_state.set_all_accounts(all_accounts);
-  }
-
-  _connect_with_mnemonic(mnemonic, state).await
+  Ok((mnemonic, all_accounts))
 }
 
 #[tauri::command]
@@ -609,3 +617,41 @@ pub async fn sign_in_decrypted_account(
   };
   _connect_with_mnemonic(mnemonic, state).await
 }
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+
+  use std::path::PathBuf;
+
+  use crate::wallet_storage;
+
+  // This decryptes a stored wallet file using the same procedure as when signing in. Most tests
+  // related to the encryped wallet storage is in `wallet_storage`.
+  #[test]
+  fn decrypt_stored_wallet_for_sign_in() {
+    const SAVED_WALLET: &str = "src/wallet_storage/test-data/saved-wallet.json";
+    let wallet_file = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(SAVED_WALLET);
+    let id = wallet_storage::AccountId::new("first".to_string());
+    let password = wallet_storage::UserPassword::new("password".to_string());
+    let hd_path: DerivationPath = COSMOS_DERIVATION_PATH.parse().unwrap();
+
+    let stored_account =
+      wallet_storage::load_existing_wallet_login_information_at_file(wallet_file, &id, &password)
+        .unwrap();
+    let (mnemonic, all_accounts) =
+      extract_mnemonic_and_all_accounts(stored_account, id.clone()).unwrap();
+
+    let expected_mnemonic = bip39::Mnemonic::from_str("country mean universe text phone begin deputy reject result good cram illness common cluster proud swamp digital patrol spread bar face december base kick").unwrap();
+    assert_eq!(mnemonic, expected_mnemonic);
+
+    assert_eq!(
+      all_accounts,
+      vec![wallet_storage::WalletAccount::new_mnemonic_backed_account(
+        id,
+        expected_mnemonic,
+        hd_path,
+      )]
+    );
+  }
+}
diff --git a/nym-wallet/src-tauri/src/wallet_storage/mod.rs b/nym-wallet/src-tauri/src/wallet_storage/mod.rs
index 27c6972c76..0de4b0bc06 100644
--- a/nym-wallet/src-tauri/src/wallet_storage/mod.rs
+++ b/nym-wallet/src-tauri/src/wallet_storage/mod.rs
@@ -1,11 +1,11 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+pub(crate) use crate::wallet_storage::account_data::{StoredLogin, WalletAccount};
 pub(crate) use crate::wallet_storage::password::{AccountId, UserPassword};
 
 use crate::error::BackendError;
 use crate::platform_constants::{STORAGE_DIR_NAME, WALLET_INFO_FILENAME};
-use crate::wallet_storage::account_data::StoredLogin;
 use crate::wallet_storage::encryption::encrypt_struct;
 use cosmrs::bip32::DerivationPath;
 use std::fs::{self, create_dir_all, OpenOptions};
@@ -58,7 +58,7 @@ pub(crate) fn load_existing_wallet_login_information(
   load_existing_wallet_login_information_at_file(filepath, id, password)
 }
 
-fn load_existing_wallet_login_information_at_file(
+pub(crate) fn load_existing_wallet_login_information_at_file(
   filepath: PathBuf,
   id: &AccountId,
   password: &UserPassword,
@@ -283,7 +283,7 @@ fn remove_account_from_wallet_login_at_file(
 
 #[cfg(test)]
 mod tests {
-  use crate::wallet_storage::account_data::WalletAccount;
+  use crate::wallet_storage::WalletAccount;
 
   use super::*;
   use config::defaults::COSMOS_DERIVATION_PATH;