From 482aac8e98440ee5fe08ff43bd9de8f3a1f46323 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Tue, 8 Jun 2021 12:55:32 -0400 Subject: [PATCH] refactor libstatus utils references --- src/app/chat/view.nim | 2 +- src/app/chat/views/chat_item.nim | 2 +- src/app/chat/views/reactions.nim | 2 +- src/app/chat/views/sticker_pack_list.nim | 2 +- src/app/chat/views/stickers.nim | 2 +- src/app/profile/views/contacts.nim | 2 +- src/app/profile/views/ens_manager.nim | 4 ++-- src/app/utilsView/view.nim | 2 +- src/app/wallet/view.nim | 2 +- src/app/wallet/views/token_list.nim | 3 ++- src/status/accounts.nim | 2 +- src/status/chat.nim | 2 +- src/status/contacts.nim | 2 +- src/status/ens.nim | 2 +- src/status/libstatus/accounts.nim | 2 +- src/status/libstatus/chat.nim | 2 +- src/status/libstatus/chatCommands.nim | 2 +- src/status/libstatus/contacts.nim | 2 +- src/status/libstatus/core.nim | 2 +- src/status/libstatus/eth/contracts.nim | 2 +- src/status/libstatus/installations.nim | 2 +- src/status/libstatus/mailservers.nim | 2 +- src/status/libstatus/settings.nim | 2 +- src/status/libstatus/tokens.nim | 2 +- src/status/libstatus/wallet.nim | 3 +-- src/status/signals/messages.nim | 4 ++-- src/status/stickers.nim | 2 +- src/status/transactions.nim | 2 +- src/status/{libstatus => }/utils.nim | 13 ++++--------- src/status/wallet.nim | 2 +- src/status/wallet/collectibles.nim | 2 +- 31 files changed, 37 insertions(+), 42 deletions(-) rename src/status/{libstatus => }/utils.nim (95%) diff --git a/src/app/chat/view.nim b/src/app/chat/view.nim index 2bfbd83927..0a38e53868 100644 --- a/src/app/chat/view.nim +++ b/src/app/chat/view.nim @@ -3,7 +3,7 @@ import ../../status/[status, mailservers] import ../../status/libstatus/chat as libstatus_chat import ../../status/libstatus/accounts/constants import ../../status/libstatus/chat as core_chat -import ../../status/libstatus/utils as status_utils +import ../../status/utils as status_utils import ../../status/chat as status_chat import ../../status/messages as status_messages import ../../status/contacts as status_contacts diff --git a/src/app/chat/views/chat_item.nim b/src/app/chat/views/chat_item.nim index 27e1fac6d8..59423787e9 100644 --- a/src/app/chat/views/chat_item.nim +++ b/src/app/chat/views/chat_item.nim @@ -1,7 +1,7 @@ import NimQml, Tables, std/wrapnils import ../../../status/[chat/chat, status, ens, accounts, settings] from ../../../status/types import Setting -import ../../../status/libstatus/utils as status_utils +import ../../../status/utils as status_utils import chat_members diff --git a/src/app/chat/views/reactions.nim b/src/app/chat/views/reactions.nim index 2556ce37ed..01c9a063f7 100644 --- a/src/app/chat/views/reactions.nim +++ b/src/app/chat/views/reactions.nim @@ -1,7 +1,7 @@ import NimQml, tables, json, chronicles import ../../../status/[status, chat/message, chat/chat, settings] import message_list, chat_item -import ../../../status/libstatus/utils as status_utils +import ../../../status/utils as status_utils import ../../../status/types logScope: diff --git a/src/app/chat/views/sticker_pack_list.nim b/src/app/chat/views/sticker_pack_list.nim index 040d3b3186..eb86d157f2 100644 --- a/src/app/chat/views/sticker_pack_list.nim +++ b/src/app/chat/views/sticker_pack_list.nim @@ -1,6 +1,6 @@ import NimQml, Tables, sequtils, sugar import ../../../status/chat/stickers, ./sticker_list -import ../../../status/types, ../../../status/libstatus/utils +import ../../../status/types, ../../../status/utils type StickerPackRoles {.pure.} = enum diff --git a/src/app/chat/views/stickers.nim b/src/app/chat/views/stickers.nim index 2e957cc870..c450a04b30 100644 --- a/src/app/chat/views/stickers.nim +++ b/src/app/chat/views/stickers.nim @@ -5,7 +5,7 @@ import # vendor libs chronicles, NimQml import # status-desktop libs - ../../../status/[status, stickers, wallet, types], ../../../status/libstatus/utils, + ../../../status/[status, stickers, wallet, types, utils], ../../../status/libstatus/stickers as status_stickers, sticker_pack_list, sticker_list, chat_item, ../../../status/tasks/[qt, task_runner_impl] logScope: diff --git a/src/app/profile/views/contacts.nim b/src/app/profile/views/contacts.nim index dd12d2090d..58b50952c2 100644 --- a/src/app/profile/views/contacts.nim +++ b/src/app/profile/views/contacts.nim @@ -1,5 +1,5 @@ import NimQml, chronicles, sequtils, sugar, strutils, json -import ../../../status/libstatus/utils as status_utils +import ../../../status/utils as status_utils import ../../../status/status import ../../../status/chat/chat import contact_list diff --git a/src/app/profile/views/ens_manager.nim b/src/app/profile/views/ens_manager.nim index d5e77361d3..7be5ba6a72 100644 --- a/src/app/profile/views/ens_manager.nim +++ b/src/app/profile/views/ens_manager.nim @@ -7,7 +7,7 @@ from ../../../status/types import Setting, PendingTransactionType, RpcException import ../../../status/ens as status_ens import ../../../status/libstatus/wallet as status_wallet import ../../../status/libstatus/settings as status_settings -import ../../../status/libstatus/utils as libstatus_utils +import ../../../status/utils as status_utils import ../../../status/[status, settings, wallet] import ../../../status/wallet import sets @@ -204,7 +204,7 @@ QtObject: proc getPrice(self: EnsManager): string {.slot.} = - result = libstatus_utils.wei2Eth(getPrice()) + result = status_utils.wei2Eth(getPrice()) proc getUsernameRegistrar(self: EnsManager): string {.slot.} = result = statusRegistrarAddress() diff --git a/src/app/utilsView/view.nim b/src/app/utilsView/view.nim index b0143b57e8..a15b6af597 100644 --- a/src/app/utilsView/view.nim +++ b/src/app/utilsView/view.nim @@ -6,7 +6,7 @@ import ../../status/libstatus/accounts/constants as accountConstants import ../../status/libstatus/tokens import ../../status/types import ../../status/libstatus/settings -import ../../status/libstatus/utils as status_utils +import ../../status/utils as status_utils import ../../status/ens as status_ens import ../utils/image_utils import web3/[ethtypes, conversions] diff --git a/src/app/wallet/view.nim b/src/app/wallet/view.nim index 91ef938e60..35092e9ac8 100644 --- a/src/app/wallet/view.nim +++ b/src/app/wallet/view.nim @@ -11,7 +11,7 @@ import # status-desktop libs ../../status/libstatus/accounts/constants, ../../status/libstatus/wallet as status_wallet, ../../status/libstatus/tokens, ../../status/types, - ../../status/libstatus/utils as status_utils, + ../../status/utils as status_utils, ../../status/libstatus/eth/contracts, ../../status/ens as status_ens, 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 diff --git a/src/app/wallet/views/token_list.nim b/src/app/wallet/views/token_list.nim index 817ac2439b..530d9fb5b9 100644 --- a/src/app/wallet/views/token_list.nim +++ b/src/app/wallet/views/token_list.nim @@ -5,7 +5,8 @@ import # vendor libs NimQml import # status-desktop libs - ../../../status/libstatus/[tokens, settings, utils, eth/contracts], + ../../../status/[utils], + ../../../status/libstatus/[tokens, settings, eth/contracts], ../../../status/tasks/[qt, task_runner_impl], ../../../status/status from web3/conversions import `$` diff --git a/src/status/accounts.nim b/src/status/accounts.nim index c58b508c21..7d5960fd15 100644 --- a/src/status/accounts.nim +++ b/src/status/accounts.nim @@ -3,7 +3,7 @@ import libstatus/accounts as status_accounts import libstatus/settings as status_settings import libstatus/accounts/constants import types -import libstatus/utils +import utils import ../eventemitter type diff --git a/src/status/chat.nim b/src/status/chat.nim index 09ccdbaa3a..96509e145e 100644 --- a/src/status/chat.nim +++ b/src/status/chat.nim @@ -4,7 +4,7 @@ import libstatus/mailservers as status_mailservers import libstatus/chatCommands as status_chat_commands import libstatus/accounts/constants as constants import types -import libstatus/utils as status_utils +import utils as status_utils import libstatus/contacts as status_contacts import stickers import ../eventemitter diff --git a/src/status/contacts.nim b/src/status/contacts.nim index ac61156d02..f515a52e11 100644 --- a/src/status/contacts.nim +++ b/src/status/contacts.nim @@ -2,7 +2,7 @@ import json, sequtils, sugar, chronicles import libstatus/contacts as status_contacts import libstatus/accounts as status_accounts import libstatus/chat as status_chat -import libstatus/utils as status_utils +import utils as status_utils import chat/chat #import chat/utils import profile/profile diff --git a/src/status/ens.nim b/src/status/ens.nim index 40d5c25cfe..039921c50d 100644 --- a/src/status/ens.nim +++ b/src/status/ens.nim @@ -7,7 +7,7 @@ import tables import strformat import libstatus/core import types -import libstatus/utils +import utils import libstatus/wallet import stew/byteutils import unicode diff --git a/src/status/libstatus/accounts.nim b/src/status/libstatus/accounts.nim index 211880c4a2..016639e926 100644 --- a/src/status/libstatus/accounts.nim +++ b/src/status/libstatus/accounts.nim @@ -2,7 +2,7 @@ import json, os, nimcrypto, uuids, json_serialization, chronicles, strutils from status_go import multiAccountGenerateAndDeriveAddresses, generateAlias, identicon, saveAccountAndLogin, login, openAccounts import core -import utils as utils +import ../utils as utils import ../types as types import accounts/constants import ../signals/types as signal_types diff --git a/src/status/libstatus/chat.nim b/src/status/libstatus/chat.nim index f825e17de8..1539647b7c 100644 --- a/src/status/libstatus/chat.nim +++ b/src/status/libstatus/chat.nim @@ -1,5 +1,5 @@ import json, times, strutils, sequtils, chronicles, json_serialization, algorithm, strformat, sugar -import core, utils +import core, ../utils import ../chat/[chat, message] import ../signals/messages import ../types diff --git a/src/status/libstatus/chatCommands.nim b/src/status/libstatus/chatCommands.nim index 8f2491489e..b68ff73ecf 100644 --- a/src/status/libstatus/chatCommands.nim +++ b/src/status/libstatus/chatCommands.nim @@ -1,5 +1,5 @@ import json, chronicles -import core, utils +import core, ../utils proc acceptRequestAddressForTransaction*(messageId: string, address: string): string = result = callPrivateRPC("acceptRequestAddressForTransaction".prefix, %* [messageId, address]) diff --git a/src/status/libstatus/contacts.nim b/src/status/libstatus/contacts.nim index 44671838b3..7d9c5680e2 100644 --- a/src/status/libstatus/contacts.nim +++ b/src/status/libstatus/contacts.nim @@ -1,5 +1,5 @@ import json, strmisc, atomics -import core, utils, ../types, settings +import core, ../utils, ../types, settings from ../profile/profile import Profile var diff --git a/src/status/libstatus/core.nim b/src/status/libstatus/core.nim index 19f458a9c3..557fdf85c2 100644 --- a/src/status/libstatus/core.nim +++ b/src/status/libstatus/core.nim @@ -1,5 +1,5 @@ import json, nimcrypto, chronicles -import status_go, utils +import status_go, ../utils logScope: topics = "rpc" diff --git a/src/status/libstatus/eth/contracts.nim b/src/status/libstatus/eth/contracts.nim index d1b248ce7a..8da5c244f2 100644 --- a/src/status/libstatus/eth/contracts.nim +++ b/src/status/libstatus/eth/contracts.nim @@ -5,7 +5,7 @@ import web3/ethtypes, stew/byteutils, nimcrypto, json_serialization, chronicles import - ../../types, ../settings, ../coder, transactions, methods, ../utils + ../../types, ../settings, ../coder, transactions, methods, ../../utils export GetPackData, PackData, BuyToken, ApproveAndCall, Transfer, BalanceOf, Register, SetPubkey, diff --git a/src/status/libstatus/installations.nim b/src/status/libstatus/installations.nim index b2bc301188..5fdf2c9e1e 100644 --- a/src/status/libstatus/installations.nim +++ b/src/status/libstatus/installations.nim @@ -1,4 +1,4 @@ -import json, core, utils, system +import json, core, ../utils, system var installations: JsonNode = %*{} var dirty: bool = true diff --git a/src/status/libstatus/mailservers.nim b/src/status/libstatus/mailservers.nim index 6314d3b2e3..986b15e9f8 100644 --- a/src/status/libstatus/mailservers.nim +++ b/src/status/libstatus/mailservers.nim @@ -1,5 +1,5 @@ import json, times -import core, utils +import core, ../utils proc ping*(mailservers: seq[string], timeoutMs: int): string = var addresses: seq[string] = @[] diff --git a/src/status/libstatus/settings.nim b/src/status/libstatus/settings.nim index b35d189112..a67e38dc24 100644 --- a/src/status/libstatus/settings.nim +++ b/src/status/libstatus/settings.nim @@ -6,7 +6,7 @@ import import ./core, ../types, ../signals/types as statusgo_types, ./accounts/constants, - ./utils + ../utils var settings {.threadvar.}: JsonNode diff --git a/src/status/libstatus/tokens.nim b/src/status/libstatus/tokens.nim index f8fbf6cfc7..278a6f81ef 100644 --- a/src/status/libstatus/tokens.nim +++ b/src/status/libstatus/tokens.nim @@ -7,7 +7,7 @@ import import ./settings, ./core, ./wallet, ./eth/contracts from ../types import Setting, Network, RpcResponse, RpcException -from utils import parseAddress +from ../utils import parseAddress logScope: topics = "wallet" diff --git a/src/status/libstatus/wallet.nim b/src/status/libstatus/wallet.nim index 88ec4d83c9..64160c591e 100644 --- a/src/status/libstatus/wallet.nim +++ b/src/status/libstatus/wallet.nim @@ -1,6 +1,5 @@ import json, json, options, json_serialization, stint, chronicles -import core, ../types, utils, strutils, strformat -import utils +import core, ../types, ../utils, strutils, strformat from status_go import validateMnemonic#, startWallet import ../wallet/account import web3/ethtypes diff --git a/src/status/signals/messages.nim b/src/status/signals/messages.nim index 573ac3b9e1..4f60039755 100644 --- a/src/status/signals/messages.nim +++ b/src/status/signals/messages.nim @@ -1,6 +1,6 @@ import json, random, strutils, sequtils, sugar, chronicles, tables import json_serialization -import ../libstatus/utils +import ../utils import ../libstatus/accounts as status_accounts import ../libstatus/accounts/constants as constants import ../libstatus/settings as status_settings @@ -11,7 +11,7 @@ import ../chat/[chat, message] import ../profile/[profile, devices] import types import web3/conversions -from ../libstatus/utils import parseAddress, wei2Eth +from ../utils import parseAddress, wei2Eth proc toMessage*(jsonMsg: JsonNode, pk: string): Message diff --git a/src/status/stickers.nim b/src/status/stickers.nim index 8713c5873b..b6a7ffc220 100644 --- a/src/status/stickers.nim +++ b/src/status/stickers.nim @@ -8,7 +8,7 @@ import # local deps types, libstatus/eth/contracts as status_contracts, libstatus/stickers as status_stickers, transactions, libstatus/wallet, ../eventemitter -from libstatus/utils as libstatus_utils import eth2Wei, gwei2Wei, toUInt64, parseAddress +from utils as libstatus_utils import eth2Wei, gwei2Wei, toUInt64, parseAddress logScope: diff --git a/src/status/transactions.nim b/src/status/transactions.nim index 5fb7f436bb..dda00095d2 100644 --- a/src/status/transactions.nim +++ b/src/status/transactions.nim @@ -6,7 +6,7 @@ import import types -from libstatus/utils as status_utils import toUInt64, gwei2Wei, parseAddress +from utils as status_utils import toUInt64, gwei2Wei, parseAddress proc buildTransaction*(source: Address, value: Uint256, gas = "", gasPrice = "", data = ""): EthSend = result = EthSend( diff --git a/src/status/libstatus/utils.nim b/src/status/utils.nim similarity index 95% rename from src/status/libstatus/utils.nim rename to src/status/utils.nim index b6c5650ebf..5f4217a7b9 100644 --- a/src/status/libstatus/utils.nim +++ b/src/status/utils.nim @@ -1,14 +1,9 @@ -import # std libs - json, random, strutils, strformat, tables, times, unicode -from sugar import `=>`, `->` - -import # vendor libs - stint, chronicles +import json, random, strutils, strformat, tables, chronicles, unicode +import stint +from times import getTime, toUnix, nanosecond +import libstatus/accounts/signing_phrases from web3 import Address, fromHex -import # status-desktop libs - accounts/signing_phrases - proc getTimelineChatId*(pubKey: string = ""): string = if pubKey == "": return "@timeline70bd746ddcc12beb96b2c9d572d0784ab137ffc774f5383e50585a932080b57cca0484b259e61cecbaa33a4c98a300a" diff --git a/src/status/wallet.nim b/src/status/wallet.nim index 2da73a0aae..1cb8fb873f 100644 --- a/src/status/wallet.nim +++ b/src/status/wallet.nim @@ -11,7 +11,7 @@ import libstatus/accounts/constants as constants import libstatus/eth/[eth, contracts] from libstatus/core import getBlockByNumber from types import PendingTransactionType, GeneratedAccount, DerivedAccount, Transaction, Setting, GasPricePrediction, `%`, StatusGoException, Network, RpcResponse, RpcException -from libstatus/utils as libstatus_utils import eth2Wei, gwei2Wei, first, toUInt64, parseAddress +from utils as libstatus_utils import eth2Wei, gwei2Wei, first, toUInt64, parseAddress import wallet/[balance_manager, account, collectibles] import transactions import ../eventemitter diff --git a/src/status/wallet/collectibles.nim b/src/status/wallet/collectibles.nim index 8f43798fcd..900d4eeb95 100644 --- a/src/status/wallet/collectibles.nim +++ b/src/status/wallet/collectibles.nim @@ -8,7 +8,7 @@ import # vendor libs import # status-desktop libs ../libstatus/core as status, ../libstatus/eth/contracts as contracts, ../libstatus/stickers as status_stickers, ../types, - web3/[conversions, ethtypes], ../libstatus/utils, account + web3/[conversions, ethtypes], ../utils, account const CRYPTOKITTY* = "cryptokitty" const KUDO* = "kudo"