From 61b5d6e311e1e9829c4425f62cdcd593630757c9 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Thu, 21 May 2020 15:13:49 -0400
Subject: [PATCH] refactor/extract generateMultiAccounts method

---
 src/models/accounts.nim | 11 +++--------
 src/status/accounts.nim | 37 ++++++++++++++++---------------------
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/src/models/accounts.nim b/src/models/accounts.nim
index b13d4d9b87..a180b78b4a 100644
--- a/src/models/accounts.nim
+++ b/src/models/accounts.nim
@@ -63,14 +63,9 @@ proc generateRandomAccountAndLogin*(self: AccountModel) =
 proc storeAccountAndLogin*(self: AccountModel, selectedAccountIndex: int, password: string): string =
   let account: GeneratedAccount = self.generatedAddresses[selectedAccountIndex]
   let password = "0x" & $keccak_256.digest(password)
-  let multiAccount = %* {
-    "accountID": account.id,
-    "paths": [constants.PATH_WALLET_ROOT, constants.PATH_EIP_1581, constants.PATH_WHISPER,
-      constants.PATH_DEFAULT_WALLET],
-    "password": password
-  }
-  let storeResult = $libstatus.multiAccountStoreDerivedAccounts($multiAccount);
-  let multiAccounts = storeResult.parseJson
+
+  let multiAccounts = status_accounts.generateMultiAccounts(%account, password)
+
   let whisperPubKey = account.derived[constants.PATH_WHISPER]["publicKey"].getStr
   let alias = $libstatus.generateAlias(whisperPubKey.toGoString)
   let identicon = $libstatus.identicon(whisperPubKey.toGoString)
diff --git a/src/status/accounts.nim b/src/status/accounts.nim
index e8c9a8e4e8..944e96062b 100644
--- a/src/status/accounts.nim
+++ b/src/status/accounts.nim
@@ -84,30 +84,23 @@ proc saveAccountAndLogin*(multiAccounts: JsonNode, alias: string, identicon: str
     echo "Account saved succesfully"
   subaccountData
 
-proc setupRandomTestAccount*(): string =
-  var result: string
-  # 3
-  let multiAccountConfig = %* {
-    "n": 5,
-    "mnemonicPhraseLength": 12,
-    "bip39Passphrase": "",
-    "paths": ["m/43'/60'/1581'/0'/0", "m/44'/60'/0'/0/0"]
-  }
-  result = $libstatus.multiAccountGenerateAndDeriveAddresses(
-      $multiAccountConfig);
-  let generatedAddresses = result.parseJson
-  let account0 = generatedAddresses[0]
-
-  # 4
-  let password = "0x2cd9bf92c5e20b1b410f5ace94d963a96e89156fbe65b70365e8596b37f1f165" #qwerty
+proc generateMultiAccounts*(account: JsonNode, password: string): JsonNode =
   let multiAccount = %* {
-    "accountID": account0["id"].getStr,
-    "paths": ["m/44'/60'/0'/0", "m/43'/60'/1581'", "m/43'/60'/1581'/0'/0",
-        "m/44'/60'/0'/0/0"],
+    "accountID": account["id"].getStr,
+    "paths": ["m/44'/60'/0'/0", "m/43'/60'/1581'", "m/43'/60'/1581'/0'/0", "m/44'/60'/0'/0/0"],
     "password": password
   }
-  result = $libstatus.multiAccountStoreDerivedAccounts($multiAccount);
-  let multiAccounts = result.parseJson
+  var response = $libstatus.multiAccountStoreDerivedAccounts($multiAccount);
+  result = response.parseJson
+
+proc setupRandomTestAccount*(): string =
+  var result: string
+
+  let generatedAddresses = generateAddresses().parseJson
+
+  let account0 = generatedAddresses[0]
+  let password = "0x2cd9bf92c5e20b1b410f5ace94d963a96e89156fbe65b70365e8596b37f1f165" #qwertyh
+  let multiAccounts = generateMultiAccounts(account0, password)
 
   # 5
   let accountData = %* {
@@ -315,6 +308,8 @@ proc setupRandomTestAccount*(): string =
     }
   }
 
+  # let alias = $libstatus.generateAlias(whisperPubKey.toGoString)
+  # let identicon = $libstatus.identicon(whisperPubKey.toGoString)
   var alias = "Delectable Overjoyed Nauplius"
   var identicon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAmElEQVR4nOzX4QmAIBBA4Yp2aY52aox2ao6mqf+SoajwON73M0J4HBy6TEEYQmMIjSE0htCECVlbDziv+/n6fuzb3OP/UmEmYgiNITRNm+LPqO2UE2YihtAYQlN818ptoZzau1btOakwEzGExhCa5hdi7d2p1zZLhZmIITSG0PhCpDGExhANEmYihtAYQmMIjSE0bwAAAP//kHQdRIWYzToAAAAASUVORK5CYII="