remove references to libstatus constants from src/app

This commit is contained in:
Iuri Matias 2021-06-08 15:14:07 -04:00
parent f7a8b14bfb
commit 8bb2dbb82a
9 changed files with 20 additions and 12 deletions

View File

@ -1,7 +1,7 @@
import NimQml, Tables, json, sequtils, chronicles, times, re, sugar, strutils, os, strformat, algorithm import NimQml, Tables, json, sequtils, chronicles, times, re, sugar, strutils, os, strformat, algorithm
import ../../status/[status, mailservers] import ../../status/[status, mailservers]
import ../../status/libstatus/chat as libstatus_chat import ../../status/libstatus/chat as libstatus_chat
import ../../status/libstatus/accounts/constants import ../../status/constants
import ../../status/libstatus/chat as core_chat import ../../status/libstatus/chat as core_chat
import ../../status/utils as status_utils import ../../status/utils as status_utils
import ../../status/chat as status_chat import ../../status/chat as status_chat

View File

@ -1,7 +1,6 @@
import NimQml, json, strutils, sugar, sequtils, tables import NimQml, json, strutils, sugar, sequtils, tables
import json_serialization import json_serialization
import ../../status/signals/types import ../../status/signals/types
import ../../status/libstatus/accounts/constants
import ../../status/types as status_types import ../../status/types as status_types
import ../../status/profile/[profile, mailserver] import ../../status/profile/[profile, mailserver]
import ../../status/[status, settings] import ../../status/[status, settings]
@ -17,6 +16,8 @@ import ../chat/views/channels_list
import chronicles import chronicles
import ../../status/tasks/marathon/mailserver/events import ../../status/tasks/marathon/mailserver/events
const DEFAULT_NETWORK_NAME* = "mainnet_rpc"
type ProfileController* = ref object type ProfileController* = ref object
view*: ProfileView view*: ProfileView
variant*: QVariant variant*: QVariant
@ -36,7 +37,7 @@ proc init*(self: ProfileController, account: Account) =
let profile = account.toProfileModel() let profile = account.toProfileModel()
let pubKey = self.status.settings.getSetting[:string](Setting.PublicKey, "0x0") let pubKey = self.status.settings.getSetting[:string](Setting.PublicKey, "0x0")
let network = self.status.settings.getSetting[:string](Setting.Networks_CurrentNetwork, constants.DEFAULT_NETWORK_NAME) let network = self.status.settings.getSetting[:string](Setting.Networks_CurrentNetwork, DEFAULT_NETWORK_NAME)
let appearance = self.status.settings.getSetting[:int](Setting.Appearance) let appearance = self.status.settings.getSetting[:int](Setting.Appearance)
let messagesFromContactsOnly = self.status.settings.getSetting[:bool](Setting.MessagesFromContactsOnly) let messagesFromContactsOnly = self.status.settings.getSetting[:bool](Setting.MessagesFromContactsOnly)
profile.appearance = appearance profile.appearance = appearance

View File

@ -9,7 +9,7 @@ import ../../status/status
import ../../status/ens as status_ens import ../../status/ens as status_ens
import ../../status/chat/chat import ../../status/chat/chat
import ../../status/types import ../../status/types
import ../../status/libstatus/accounts/constants as accountConstants import ../../status/constants as accountConstants
import qrcode/qrcode import qrcode/qrcode
import ../utils/image_utils import ../utils/image_utils

View File

@ -2,7 +2,6 @@ import NimQml, os, strformat, strutils, parseUtils, chronicles
import stint import stint
import ../../status/[status, wallet] import ../../status/[status, wallet]
import ../../status/stickers import ../../status/stickers
import ../../status/libstatus/accounts/constants as accountConstants
import ../../status/libstatus/tokens import ../../status/libstatus/tokens
import ../../status/types import ../../status/types
import ../../status/libstatus/settings import ../../status/libstatus/settings

View File

@ -8,7 +8,6 @@ import # vendor libs
import # status-desktop libs import # status-desktop libs
../../status/[status, wallet, settings], ../../status/[status, wallet, settings],
../../status/wallet/collectibles as status_collectibles, ../../status/wallet/collectibles as status_collectibles,
../../status/libstatus/accounts/constants,
../../status/libstatus/wallet as status_wallet, ../../status/libstatus/wallet as status_wallet,
../../status/libstatus/tokens, ../../status/types, ../../status/libstatus/tokens, ../../status/types,
../../status/utils as status_utils, ../../status/utils as status_utils,
@ -16,6 +15,8 @@ import # status-desktop libs
views/[asset_list, account_list, account_item, token_list, transaction_list, collectibles_list], views/[asset_list, account_list, account_item, token_list, transaction_list, collectibles_list],
../../status/tasks/[qt, task_runner_impl], ../../status/signals/types as signal_types ../../status/tasks/[qt, task_runner_impl], ../../status/signals/types as signal_types
const ZERO_ADDRESS* = "0x0000000000000000000000000000000000000000"
type type
SendTransactionTaskArg = ref object of QObjectTaskArg SendTransactionTaskArg = ref object of QObjectTaskArg
from_addr: string from_addr: string

View File

@ -11,7 +11,7 @@ import app/login/core as login
import app/provider/core as provider import app/provider/core as provider
import status/signals/core as signals import status/signals/core as signals
import status/types import status/types
import status/libstatus/accounts/constants import status/constants
import status_go import status_go
import status/status as statuslib import status/status as statuslib
import ./eventemitter import ./eventemitter

View File

@ -1,11 +1,12 @@
import options, chronicles, json, json_serialization, sequtils, sugar import options, chronicles, json, json_serialization, sequtils, sugar
import libstatus/accounts as status_accounts import libstatus/accounts as status_accounts
import libstatus/settings as status_settings import libstatus/settings as status_settings
import libstatus/accounts/constants
import types import types
import utils import utils
import ../eventemitter import ../eventemitter
const DEFAULT_NETWORK_NAME* = "mainnet_rpc"
type type
AccountModel* = ref object AccountModel* = ref object
generatedAddresses*: seq[GeneratedAccount] generatedAddresses*: seq[GeneratedAccount]
@ -92,5 +93,5 @@ proc changeNetwork*(self: AccountModel, fleetConfig: FleetConfig, network: strin
proc getNodeConfig*(self: AccountModel, fleetConfig: FleetConfig, installationId: string, networkConfig: JsonNode, fleet: Fleet = Fleet.PROD): JsonNode = proc getNodeConfig*(self: AccountModel, fleetConfig: FleetConfig, installationId: string, networkConfig: JsonNode, fleet: Fleet = Fleet.PROD): JsonNode =
result = status_accounts.getNodeConfig(fleetConfig, installationId, networkConfig, fleet) result = status_accounts.getNodeConfig(fleetConfig, installationId, networkConfig, fleet)
proc getNodeConfig*(self: AccountModel, fleetConfig: FleetConfig, installationId: string, currentNetwork: string = constants.DEFAULT_NETWORK_NAME, fleet: Fleet = Fleet.PROD): JsonNode = proc getNodeConfig*(self: AccountModel, fleetConfig: FleetConfig, installationId: string, currentNetwork: string = DEFAULT_NETWORK_NAME, fleet: Fleet = Fleet.PROD): JsonNode =
result = status_accounts.getNodeConfig(fleetConfig, installationId, currentNetwork, fleet) result = status_accounts.getNodeConfig(fleetConfig, installationId, currentNetwork, fleet)

View File

@ -2,7 +2,6 @@ import json, strutils, sequtils, tables, chronicles, times, sugar
import libstatus/chat as status_chat import libstatus/chat as status_chat
import libstatus/mailservers as status_mailservers import libstatus/mailservers as status_mailservers
import libstatus/chatCommands as status_chat_commands import libstatus/chatCommands as status_chat_commands
import libstatus/accounts/constants as constants
import types import types
import utils as status_utils import utils as status_utils
import libstatus/contacts as status_contacts import libstatus/contacts as status_contacts
@ -19,6 +18,7 @@ logScope:
topics = "chat-model" topics = "chat-model"
const backToFirstChat* = "__goBackToFirstChat" const backToFirstChat* = "__goBackToFirstChat"
const ZERO_ADDRESS* = "0x0000000000000000000000000000000000000000"
type type
ChatUpdateArgs* = ref object of Args ChatUpdateArgs* = ref object of Args
@ -440,12 +440,12 @@ proc declineRequestTransaction*(self: ChatModel, messageId: string) =
self.processUpdateForTransaction(messageId, response) self.processUpdateForTransaction(messageId, response)
proc requestAddressForTransaction*(self: ChatModel, chatId: string, fromAddress: string, amount: string, tokenAddress: string) = proc requestAddressForTransaction*(self: ChatModel, chatId: string, fromAddress: string, amount: string, tokenAddress: string) =
let address = if (tokenAddress == constants.ZERO_ADDRESS): "" else: tokenAddress let address = if (tokenAddress == ZERO_ADDRESS): "" else: tokenAddress
let response = status_chat_commands.requestAddressForTransaction(chatId, fromAddress, amount, address) let response = status_chat_commands.requestAddressForTransaction(chatId, fromAddress, amount, address)
discard self.processMessageUpdateAfterSend(response) discard self.processMessageUpdateAfterSend(response)
proc requestTransaction*(self: ChatModel, chatId: string, fromAddress: string, amount: string, tokenAddress: string) = proc requestTransaction*(self: ChatModel, chatId: string, fromAddress: string, amount: string, tokenAddress: string) =
let address = if (tokenAddress == constants.ZERO_ADDRESS): "" else: tokenAddress let address = if (tokenAddress == ZERO_ADDRESS): "" else: tokenAddress
let response = status_chat_commands.requestTransaction(chatId, fromAddress, amount, address) let response = status_chat_commands.requestTransaction(chatId, fromAddress, amount, address)
discard self.processMessageUpdateAfterSend(response) discard self.processMessageUpdateAfterSend(response)

6
src/status/constants.nim Normal file
View File

@ -0,0 +1,6 @@
import libstatus/accounts/constants
export DATADIR
export STATUSGODIR
export KEYSTOREDIR
export TMPDIR