status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

move addPeer to the setupAccount function

This commit is contained in:
Jonathan Rainville 2020-05-25 15:55:36 -04:00 committed by Iuri Matias
parent f7d99c4bb4
commit 594b3974c9
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/models/accounts.nim
View File

@ -2,7 +2,6 @@ import eventemitter
import json_serialization import json_serialization
import ../status/accounts as status_accounts import ../status/accounts as status_accounts
import ../status/types import ../status/types
import ../status/libstatus
type type
Address* = ref object Address* = ref object
@ -37,15 +36,9 @@ proc generateAddresses*(self: AccountModel): seq[GeneratedAccount] =
proc generateRandomAccountAndLogin*(self: AccountModel) = proc generateRandomAccountAndLogin*(self: AccountModel) =
let generatedAccounts = status_accounts.generateAddresses() let generatedAccounts = status_accounts.generateAddresses()
let account = status_accounts.setupAccount(generatedAccounts[0], "qwerty") let account = status_accounts.setupAccount(generatedAccounts[0], "qwerty")
# TODO this is needed for now for the retrieving of past messages. We'll either move or remove it later
let peer = "enode://44160e22e8b42bd32a06c1532165fa9e096eebedd7fa6d6e5f8bbef0440bc4a4591fe3651be68193a7ec029021cdb496cfe1d7f9f1dc69eb99226e6f39a7a5d4@35.225.221.245:443"
discard libstatus.addPeer(peer)
self.events.emit("accountsReady", AccountArgs(account: account)) self.events.emit("accountsReady", AccountArgs(account: account))
proc storeAccountAndLogin*(self: AccountModel, selectedAccountIndex: int, password: string): Account = proc storeAccountAndLogin*(self: AccountModel, selectedAccountIndex: int, password: string): Account =
let generatedAccount: GeneratedAccount = self.generatedAddresses[selectedAccountIndex] let generatedAccount: GeneratedAccount = self.generatedAddresses[selectedAccountIndex]
result = status_accounts.setupAccount(generatedAccount, password) result = status_accounts.setupAccount(generatedAccount, password)
# TODO this is needed for now for the retrieving of past messages. We'll either move or remove it later
let peer = "enode://44160e22e8b42bd32a06c1532165fa9e096eebedd7fa6d6e5f8bbef0440bc4a4591fe3651be68193a7ec029021cdb496cfe1d7f9f1dc69eb99226e6f39a7a5d4@35.225.221.245:443"
discard libstatus.addPeer(peer)
self.events.emit("accountsReady", AccountArgs(account: result)) self.events.emit("accountsReady", AccountArgs(account: result))

6
src/status/accounts.nim
View File

@ -130,4 +130,8 @@ proc setupAccount*(account: GeneratedAccount, password: string): Account =
let accountData = getAccountData(account, alias, identicon) let accountData = getAccountData(account, alias, identicon)
var settingsJSON = getAccountSettings(account, alias, identicon, multiAccounts, constants.DEFAULT_NETWORKS) var settingsJSON = getAccountSettings(account, alias, identicon, multiAccounts, constants.DEFAULT_NETWORKS)
saveAccountAndLogin(multiAccounts, alias, identicon, $accountData, password, $constants.NODE_CONFIG, $settingsJSON) result = saveAccountAndLogin(multiAccounts, alias, identicon, $accountData, password, $constants.NODE_CONFIG, $settingsJSON)
# TODO this is needed for now for the retrieving of past messages. We'll either move or remove it later
let peer = "enode://44160e22e8b42bd32a06c1532165fa9e096eebedd7fa6d6e5f8bbef0440bc4a4591fe3651be68193a7ec029021cdb496cfe1d7f9f1dc69eb99226e6f39a7a5d4@35.225.221.245:443"
discard libstatus.addPeer(peer)