From eab9d68affae89e473fcdfc2def66d151a551e48 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Tue, 8 Jun 2021 12:31:34 -0400 Subject: [PATCH] move types out of libstatus; remove libstatus types references --- src/app/browser/core.nim | 1 - src/app/browser/view.nim | 2 +- src/app/browser/views/bookmark_list.nim | 2 +- src/app/chat/core.nim | 2 +- src/app/chat/views/chat_item.nim | 2 +- src/app/chat/views/communities.nim | 2 +- src/app/chat/views/reactions.nim | 2 +- src/app/chat/views/sticker_list.nim | 2 +- src/app/chat/views/sticker_pack_list.nim | 2 +- src/app/chat/views/stickers.nim | 2 +- src/app/login/core.nim | 2 +- src/app/login/view.nim | 2 +- src/app/node/core.nim | 2 +- src/app/onboarding/core.nim | 2 +- src/app/onboarding/view.nim | 2 +- src/app/onboarding/views/account_info.nim | 2 +- src/app/profile/core.nim | 2 +- src/app/profile/view.nim | 2 +- src/app/profile/views/custom_networks.nim | 2 +- src/app/profile/views/ens_manager.nim | 2 +- src/app/profile/views/fleets.nim | 2 +- src/app/profile/views/mnemonic.nim | 2 +- src/app/profile/views/profile_info.nim | 2 +- src/app/provider/view.nim | 2 +- src/app/utilsView/core.nim | 2 +- src/app/utilsView/view.nim | 2 +- src/app/wallet/core.nim | 2 +- src/app/wallet/view.nim | 2 +- src/nim_status_client.nim | 2 +- src/status/accounts.nim | 2 +- src/status/chat.nim | 2 +- src/status/chat/chat.nim | 2 +- src/status/devices.nim | 2 +- src/status/ens.nim | 2 +- src/status/fleet.nim | 2 +- src/status/libstatus/accounts.nim | 2 +- src/status/libstatus/browser.nim | 2 +- src/status/libstatus/chat.nim | 2 +- src/status/libstatus/contacts.nim | 2 +- src/status/libstatus/edn_helpers.nim | 2 +- src/status/libstatus/eth/contracts.nim | 2 +- src/status/libstatus/eth/eth.nim | 2 +- src/status/libstatus/eth/methods.nim | 2 +- src/status/libstatus/eth/transactions.nim | 2 +- src/status/libstatus/settings.nim | 2 +- src/status/libstatus/stickers.nim | 2 +- src/status/libstatus/tokens.nim | 2 +- src/status/libstatus/wallet.nim | 15 ++++++--------- src/status/mailservers.nim | 2 +- src/status/network.nim | 2 +- src/status/profile.nim | 2 +- src/status/profile/profile.nim | 2 +- src/status/settings.nim | 2 +- src/status/signals/communities.nim | 2 +- src/status/signals/core.nim | 2 +- src/status/signals/messages.nim | 2 +- src/status/signals/types.nim | 2 +- src/status/status.nim | 2 +- src/status/stickers.nim | 2 +- src/status/tasks/marathon/mailserver/model.nim | 2 +- src/status/transactions.nim | 2 +- src/status/{libstatus => }/types.nim | 13 +++++-------- src/status/wallet.nim | 2 +- src/status/wallet/account.nim | 2 +- src/status/wallet/balance_manager.nim | 2 +- src/status/wallet/collectibles.nim | 2 +- vendor/status-go | 2 +- 67 files changed, 75 insertions(+), 82 deletions(-) rename src/status/{libstatus => }/types.nim (97%) diff --git a/src/app/browser/core.nim b/src/app/browser/core.nim index e6ecd4cce1..e89b2dbfda 100644 --- a/src/app/browser/core.nim +++ b/src/app/browser/core.nim @@ -1,6 +1,5 @@ import NimQml, chronicles import ../../status/status -import ../../status/libstatus/types as status_types import view logScope: diff --git a/src/app/browser/view.nim b/src/app/browser/view.nim index 2807f05206..1248e74eb4 100644 --- a/src/app/browser/view.nim +++ b/src/app/browser/view.nim @@ -1,7 +1,7 @@ import NimQml, json, chronicles import ../../status/status import ../../status/libstatus/browser as status_browser -import ../../status/libstatus/types +import ../../status/types import views/bookmark_list QtObject: diff --git a/src/app/browser/views/bookmark_list.nim b/src/app/browser/views/bookmark_list.nim index 664720b0d4..19e2f05dfa 100644 --- a/src/app/browser/views/bookmark_list.nim +++ b/src/app/browser/views/bookmark_list.nim @@ -1,6 +1,6 @@ import NimQml, Tables, chronicles import sequtils as sequtils -import ../../../status/libstatus/types +import ../../../status/types type BookmarkRoles {.pure.} = enum diff --git a/src/app/chat/core.nim b/src/app/chat/core.nim index 00b8ac53ce..7cfe838160 100644 --- a/src/app/chat/core.nim +++ b/src/app/chat/core.nim @@ -2,7 +2,7 @@ import NimQml, chronicles, tables import ../../status/chat as chat_model import ../../status/messages as messages_model import ../../status/signals/types -import ../../status/libstatus/types as status_types +import ../../status/types as status_types import ../../status/[chat, contacts, status, wallet, stickers, settings] import view, views/channels_list, views/message_list, views/reactions, views/stickers as stickers_view import ../../eventemitter diff --git a/src/app/chat/views/chat_item.nim b/src/app/chat/views/chat_item.nim index baae6b6632..27e1fac6d8 100644 --- a/src/app/chat/views/chat_item.nim +++ b/src/app/chat/views/chat_item.nim @@ -1,6 +1,6 @@ import NimQml, Tables, std/wrapnils import ../../../status/[chat/chat, status, ens, accounts, settings] -from ../../../status/libstatus/types import Setting +from ../../../status/types import Setting import ../../../status/libstatus/utils as status_utils import chat_members diff --git a/src/app/chat/views/communities.nim b/src/app/chat/views/communities.nim index 939045e7c0..2d5a664b30 100644 --- a/src/app/chat/views/communities.nim +++ b/src/app/chat/views/communities.nim @@ -7,7 +7,7 @@ import ./community_membership_request_list import ./channels_list import ../../utils/image_utils import ../../../status/signals/types as signal_types -import ../../../status/libstatus/types +import ../../../status/types logScope: diff --git a/src/app/chat/views/reactions.nim b/src/app/chat/views/reactions.nim index f984889a8d..2556ce37ed 100644 --- a/src/app/chat/views/reactions.nim +++ b/src/app/chat/views/reactions.nim @@ -2,7 +2,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/libstatus/types +import ../../../status/types logScope: topics = "reactions-view" diff --git a/src/app/chat/views/sticker_list.nim b/src/app/chat/views/sticker_list.nim index 1c9e0ae9ea..71a8352aff 100644 --- a/src/app/chat/views/sticker_list.nim +++ b/src/app/chat/views/sticker_list.nim @@ -1,6 +1,6 @@ import NimQml, Tables, sequtils import ../../../status/chat/stickers -import ../../../status/libstatus/types +import ../../../status/types type StickerRoles {.pure.} = enum diff --git a/src/app/chat/views/sticker_pack_list.nim b/src/app/chat/views/sticker_pack_list.nim index 587113a31d..040d3b3186 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/libstatus/types, ../../../status/libstatus/utils +import ../../../status/types, ../../../status/libstatus/utils type StickerPackRoles {.pure.} = enum diff --git a/src/app/chat/views/stickers.nim b/src/app/chat/views/stickers.nim index 7a436624b4..2e957cc870 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], ../../../status/libstatus/[types, utils], + ../../../status/[status, stickers, wallet, types], ../../../status/libstatus/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/login/core.nim b/src/app/login/core.nim index 91a4bf9e25..915b6b9675 100644 --- a/src/app/login/core.nim +++ b/src/app/login/core.nim @@ -1,5 +1,5 @@ import NimQml, chronicles, options, std/wrapnils -import ../../status/libstatus/types as status_types +import ../../status/types as status_types import ../../status/signals/types import ../../status/status import view diff --git a/src/app/login/view.nim b/src/app/login/view.nim index 4daf91d4cf..e65a3ada88 100644 --- a/src/app/login/view.nim +++ b/src/app/login/view.nim @@ -1,6 +1,6 @@ import NimQml, Tables, json, nimcrypto, strformat, json_serialization, chronicles import ../../status/signals/types -import ../../status/libstatus/types as status_types +import ../../status/types as status_types import ../../status/accounts as AccountModel import ../onboarding/views/account_info import ../../status/status diff --git a/src/app/node/core.nim b/src/app/node/core.nim index 505d19e411..55496226d8 100644 --- a/src/app/node/core.nim +++ b/src/app/node/core.nim @@ -1,7 +1,7 @@ import NimQml, chronicles import ../../status/signals/types import ../../status/[status, node, network] -import ../../status/libstatus/types as status_types +import ../../status/types as status_types import ../../eventemitter import view diff --git a/src/app/onboarding/core.nim b/src/app/onboarding/core.nim index 3e20dff9d7..3e3e5587a3 100644 --- a/src/app/onboarding/core.nim +++ b/src/app/onboarding/core.nim @@ -1,5 +1,5 @@ import NimQml, chronicles, std/wrapnils -import ../../status/libstatus/types as status_types +import ../../status/types as status_types import ../../status/accounts as AccountModel import ../../status/status import ../../status/signals/types diff --git a/src/app/onboarding/view.nim b/src/app/onboarding/view.nim index be83544620..dbb5855628 100644 --- a/src/app/onboarding/view.nim +++ b/src/app/onboarding/view.nim @@ -1,5 +1,5 @@ import NimQml, Tables, json, nimcrypto, strformat, json_serialization, strutils -import ../../status/libstatus/types as status_types +import ../../status/types as status_types import ../../status/signals/types import ../../status/accounts as AccountModel import ../../status/[status, wallet] diff --git a/src/app/onboarding/views/account_info.nim b/src/app/onboarding/views/account_info.nim index 59c48fb24c..cef3c7c50d 100644 --- a/src/app/onboarding/views/account_info.nim +++ b/src/app/onboarding/views/account_info.nim @@ -1,5 +1,5 @@ import NimQml -import ../../../status/libstatus/types +import ../../../status/types import std/wrapnils QtObject: diff --git a/src/app/profile/core.nim b/src/app/profile/core.nim index b422005609..562775cea9 100644 --- a/src/app/profile/core.nim +++ b/src/app/profile/core.nim @@ -2,7 +2,7 @@ import NimQml, json, strutils, sugar, sequtils, tables import json_serialization import ../../status/signals/types import ../../status/libstatus/accounts/constants -import ../../status/libstatus/types as status_types +import ../../status/types as status_types import ../../status/profile/[profile, mailserver] import ../../status/[status, settings] import ../../status/contacts as status_contacts diff --git a/src/app/profile/view.nim b/src/app/profile/view.nim index 60824eb62c..faa95ffb58 100644 --- a/src/app/profile/view.nim +++ b/src/app/profile/view.nim @@ -8,7 +8,7 @@ import ../../status/contacts as status_contacts import ../../status/status import ../../status/ens as status_ens import ../../status/chat/chat -import ../../status/libstatus/types +import ../../status/types import ../../status/libstatus/accounts/constants as accountConstants import qrcode/qrcode import ../utils/image_utils diff --git a/src/app/profile/views/custom_networks.nim b/src/app/profile/views/custom_networks.nim index 422cdaec27..b5bd8cb536 100644 --- a/src/app/profile/views/custom_networks.nim +++ b/src/app/profile/views/custom_networks.nim @@ -2,7 +2,7 @@ import NimQml import Tables import json, sequtils, sugar import ../../../status/libstatus/settings -import ../../../status/libstatus/types +import ../../../status/types type CustomNetworkRoles {.pure.} = enum diff --git a/src/app/profile/views/ens_manager.nim b/src/app/profile/views/ens_manager.nim index 90e468a7c0..d5e77361d3 100644 --- a/src/app/profile/views/ens_manager.nim +++ b/src/app/profile/views/ens_manager.nim @@ -3,7 +3,7 @@ import Tables import json import sequtils import strutils -from ../../../status/libstatus/types import Setting, PendingTransactionType, RpcException +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 diff --git a/src/app/profile/views/fleets.nim b/src/app/profile/views/fleets.nim index 93d2d97d55..d6b08e877f 100644 --- a/src/app/profile/views/fleets.nim +++ b/src/app/profile/views/fleets.nim @@ -1,6 +1,6 @@ import NimQml import chronicles, strutils -import ../../../status/libstatus/types as status_types +import ../../../status/types as status_types import ../../../status/[status, settings, accounts] QtObject: diff --git a/src/app/profile/views/mnemonic.nim b/src/app/profile/views/mnemonic.nim index 23cacd8292..ed01043b25 100644 --- a/src/app/profile/views/mnemonic.nim +++ b/src/app/profile/views/mnemonic.nim @@ -1,6 +1,6 @@ import NimQml, chronicles, strutils import ../../../status/[status, settings] -import ../../../status/libstatus/types +import ../../../status/types import options logScope: diff --git a/src/app/profile/views/profile_info.nim b/src/app/profile/views/profile_info.nim index b1818205af..c3d222d696 100644 --- a/src/app/profile/views/profile_info.nim +++ b/src/app/profile/views/profile_info.nim @@ -1,7 +1,7 @@ import NimQml import chronicles import ../../../status/profile/profile -import ../../../status/libstatus/types +import ../../../status/types import std/wrapnils QtObject: diff --git a/src/app/provider/view.nim b/src/app/provider/view.nim index 602b7515ab..5d2f543d35 100644 --- a/src/app/provider/view.nim +++ b/src/app/provider/view.nim @@ -1,6 +1,6 @@ import NimQml import ../../status/[status, ens, chat/stickers, wallet, settings] -import ../../status/libstatus/types +import ../../status/types import ../../status/libstatus/accounts import ../../status/libstatus/core import ../../status/libstatus/settings as status_settings diff --git a/src/app/utilsView/core.nim b/src/app/utilsView/core.nim index e9400419ff..cd24a7511f 100644 --- a/src/app/utilsView/core.nim +++ b/src/app/utilsView/core.nim @@ -1,7 +1,7 @@ import NimQml, chronicles import ../../status/signals/types import ../../status/[status, node, network] -import ../../status/libstatus/types as status_types +import ../../status/types as status_types import view import ../../eventemitter diff --git a/src/app/utilsView/view.nim b/src/app/utilsView/view.nim index 256a3028df..b0143b57e8 100644 --- a/src/app/utilsView/view.nim +++ b/src/app/utilsView/view.nim @@ -4,7 +4,7 @@ import ../../status/[status, wallet] import ../../status/stickers import ../../status/libstatus/accounts/constants as accountConstants import ../../status/libstatus/tokens -import ../../status/libstatus/types +import ../../status/types import ../../status/libstatus/settings import ../../status/libstatus/utils as status_utils import ../../status/ens as status_ens diff --git a/src/app/wallet/core.nim b/src/app/wallet/core.nim index 764e0a40da..991f3cb7e1 100644 --- a/src/app/wallet/core.nim +++ b/src/app/wallet/core.nim @@ -2,7 +2,7 @@ import NimQml, strformat, strutils, chronicles, sugar, sequtils import view import views/[asset_list, account_list, account_item] -import ../../status/libstatus/types as status_types +import ../../status/types as status_types import ../../status/signals/types import ../../status/[status, wallet, settings] import ../../status/wallet/account as WalletTypes diff --git a/src/app/wallet/view.nim b/src/app/wallet/view.nim index 91fbafe775..91ef938e60 100644 --- a/src/app/wallet/view.nim +++ b/src/app/wallet/view.nim @@ -10,7 +10,7 @@ import # status-desktop libs ../../status/wallet/collectibles as status_collectibles, ../../status/libstatus/accounts/constants, ../../status/libstatus/wallet as status_wallet, - ../../status/libstatus/tokens, ../../status/libstatus/types, + ../../status/libstatus/tokens, ../../status/types, ../../status/libstatus/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], diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim index 0dceabab3b..1b63651dc6 100644 --- a/src/nim_status_client.nim +++ b/src/nim_status_client.nim @@ -10,7 +10,7 @@ import app/onboarding/core as onboarding import app/login/core as login import app/provider/core as provider import status/signals/core as signals -import status/libstatus/types +import status/types import status/libstatus/accounts/constants import status_go import status/status as statuslib diff --git a/src/status/accounts.nim b/src/status/accounts.nim index d3999f7ba2..c58b508c21 100644 --- a/src/status/accounts.nim +++ b/src/status/accounts.nim @@ -2,7 +2,7 @@ import options, chronicles, json, json_serialization, sequtils, sugar import libstatus/accounts as status_accounts import libstatus/settings as status_settings import libstatus/accounts/constants -import libstatus/types +import types import libstatus/utils import ../eventemitter diff --git a/src/status/chat.nim b/src/status/chat.nim index e386abbe9c..09ccdbaa3a 100644 --- a/src/status/chat.nim +++ b/src/status/chat.nim @@ -3,7 +3,7 @@ import libstatus/chat as status_chat import libstatus/mailservers as status_mailservers import libstatus/chatCommands as status_chat_commands import libstatus/accounts/constants as constants -import libstatus/types +import types import libstatus/utils as status_utils import libstatus/contacts as status_contacts import stickers diff --git a/src/status/chat/chat.nim b/src/status/chat/chat.nim index a755436ff7..8e6665224e 100644 --- a/src/status/chat/chat.nim +++ b/src/status/chat/chat.nim @@ -1,6 +1,6 @@ import strformat, json, sequtils from message import Message -import ../libstatus/types +import ../types type ChatType* {.pure.}= enum Unknown = 0, diff --git a/src/status/devices.nim b/src/status/devices.nim index 0795c27c1e..a0291ff142 100644 --- a/src/status/devices.nim +++ b/src/status/devices.nim @@ -1,6 +1,6 @@ import system import libstatus/settings -import libstatus/types +import types import libstatus/installations import profile/devices import json diff --git a/src/status/ens.nim b/src/status/ens.nim index dd7d0227e6..40d5c25cfe 100644 --- a/src/status/ens.nim +++ b/src/status/ens.nim @@ -6,7 +6,7 @@ import json_serialization import tables import strformat import libstatus/core -import libstatus/types +import types import libstatus/utils import libstatus/wallet import stew/byteutils diff --git a/src/status/fleet.nim b/src/status/fleet.nim index 0d9f48e8e0..29bc1ad47c 100644 --- a/src/status/fleet.nim +++ b/src/status/fleet.nim @@ -1,5 +1,5 @@ import json -import libstatus/types +import types type FleetModel* = ref object diff --git a/src/status/libstatus/accounts.nim b/src/status/libstatus/accounts.nim index a9597ef7cc..211880c4a2 100644 --- a/src/status/libstatus/accounts.nim +++ b/src/status/libstatus/accounts.nim @@ -3,7 +3,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 types as types +import ../types as types import accounts/constants import ../signals/types as signal_types import ../wallet/account diff --git a/src/status/libstatus/browser.nim b/src/status/libstatus/browser.nim index 95c3527b7e..4b3c185cfc 100644 --- a/src/status/libstatus/browser.nim +++ b/src/status/libstatus/browser.nim @@ -1,4 +1,4 @@ -import core, types, json, chronicles +import core, ../types, json, chronicles proc storeBookmark*(url: string, name: string): Bookmark = let payload = %* [{"url": url, "name": name}] diff --git a/src/status/libstatus/chat.nim b/src/status/libstatus/chat.nim index e9064cc941..f825e17de8 100644 --- a/src/status/libstatus/chat.nim +++ b/src/status/libstatus/chat.nim @@ -2,7 +2,7 @@ import json, times, strutils, sequtils, chronicles, json_serialization, algorith import core, utils import ../chat/[chat, message] import ../signals/messages -import ./types +import ../types import ./settings as status_settings proc buildFilter*(chat: Chat):JsonNode = diff --git a/src/status/libstatus/contacts.nim b/src/status/libstatus/contacts.nim index f384e76de0..44671838b3 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/edn_helpers.nim b/src/status/libstatus/edn_helpers.nim index 3aaf12b2ae..b1e0e4cba6 100644 --- a/src/status/libstatus/edn_helpers.nim +++ b/src/status/libstatus/edn_helpers.nim @@ -1,6 +1,6 @@ import typetraits import edn, chronicles -import ./types # FIXME: there should be no type deps +import ../types # FIXME: there should be no type deps # forward declaration: proc parseNode[T](node: EdnNode, searchName: string): T diff --git a/src/status/libstatus/eth/contracts.nim b/src/status/libstatus/eth/contracts.nim index 250e09b7ad..d1b248ce7a 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/eth/eth.nim b/src/status/libstatus/eth/eth.nim index 29fe368050..a90bfd1e20 100644 --- a/src/status/libstatus/eth/eth.nim +++ b/src/status/libstatus/eth/eth.nim @@ -2,7 +2,7 @@ import web3/ethtypes import - transactions, ../types + transactions, ../../types proc sendTransaction*(tx: var EthSend, password: string, success: var bool): string = success = true diff --git a/src/status/libstatus/eth/methods.nim b/src/status/libstatus/eth/methods.nim index 3e7b4a2a91..2452423f77 100644 --- a/src/status/libstatus/eth/methods.nim +++ b/src/status/libstatus/eth/methods.nim @@ -5,7 +5,7 @@ import nimcrypto, web3/[encoding, ethtypes] import - ../coder, eth, transactions, ../types # FIXME: 'types' produces a compiler warning, but doesn't compiler without it 🤷‍♂️ + ../coder, eth, transactions, ../../types # FIXME: 'types' produces a compiler warning, but doesn't compiler without it 🤷‍♂️ export sendTransaction diff --git a/src/status/libstatus/eth/transactions.nim b/src/status/libstatus/eth/transactions.nim index e79b68387b..4fe7092581 100644 --- a/src/status/libstatus/eth/transactions.nim +++ b/src/status/libstatus/eth/transactions.nim @@ -5,7 +5,7 @@ import json_serialization, chronicles, web3/ethtypes import - ../core, ../types, ../conversions + ../core, ../../types, ../conversions proc estimateGas*(tx: EthSend): RpcResponse = let response = core.callPrivateRPC("eth_estimateGas", %*[%tx]) diff --git a/src/status/libstatus/settings.nim b/src/status/libstatus/settings.nim index 65ae4941c1..b35d189112 100644 --- a/src/status/libstatus/settings.nim +++ b/src/status/libstatus/settings.nim @@ -5,7 +5,7 @@ import json_serialization, chronicles, uuids import - ./core, ./types, ../signals/types as statusgo_types, ./accounts/constants, + ./core, ../types, ../signals/types as statusgo_types, ./accounts/constants, ./utils var diff --git a/src/status/libstatus/stickers.nim b/src/status/libstatus/stickers.nim index 503ff46bea..0c6e53bd54 100644 --- a/src/status/libstatus/stickers.nim +++ b/src/status/libstatus/stickers.nim @@ -8,7 +8,7 @@ import # vendor libs from nimcrypto import fromHex import # status-desktop libs - ./core as status, ./types, ./eth/contracts, ./settings, ./edn_helpers + ./core as status, ../types, ./eth/contracts, ./settings, ./edn_helpers proc decodeContentHash*(value: string): string = if value == "": diff --git a/src/status/libstatus/tokens.nim b/src/status/libstatus/tokens.nim index e799b99630..f8fbf6cfc7 100644 --- a/src/status/libstatus/tokens.nim +++ b/src/status/libstatus/tokens.nim @@ -6,7 +6,7 @@ import import ./settings, ./core, ./wallet, ./eth/contracts -from types import Setting, Network, RpcResponse, RpcException +from ../types import Setting, Network, RpcResponse, RpcException from utils import parseAddress logScope: diff --git a/src/status/libstatus/wallet.nim b/src/status/libstatus/wallet.nim index 534ee70eb3..88ec4d83c9 100644 --- a/src/status/libstatus/wallet.nim +++ b/src/status/libstatus/wallet.nim @@ -1,12 +1,9 @@ -import # std libs - json, times, options, strutils, strformat - -import # vendor libs - json_serialization, stint, chronicles, web3/ethtypes -from status_go import validateMnemonic - -import # status-desktop libs - ../wallet/account, ./types, ./conversions, ./core, ./types, ./utils +import json, json, options, json_serialization, stint, chronicles +import core, ../types, utils, strutils, strformat +import utils +from status_go import validateMnemonic#, startWallet +import ../wallet/account +import web3/ethtypes proc getWalletAccounts*(): seq[WalletAccount] = try: diff --git a/src/status/mailservers.nim b/src/status/mailservers.nim index 4285ffbf09..44479a486e 100644 --- a/src/status/mailservers.nim +++ b/src/status/mailservers.nim @@ -8,7 +8,7 @@ import ../eventemitter import signals/types #TODO: temporary? -import libstatus/types as LibStatusTypes +import types as LibStatusTypes type MailserversModel* = ref object diff --git a/src/status/network.nim b/src/status/network.nim index c229f1efba..90166235a5 100644 --- a/src/status/network.nim +++ b/src/status/network.nim @@ -4,7 +4,7 @@ import libstatus/settings import json import uuids import json_serialization -import libstatus/types +import types logScope: topics = "network-model" diff --git a/src/status/profile.nim b/src/status/profile.nim index 0bd0cc8bd0..79b7b20532 100644 --- a/src/status/profile.nim +++ b/src/status/profile.nim @@ -1,5 +1,5 @@ import json -import libstatus/types +import types import profile/profile import libstatus/core as libstatus_core import libstatus/accounts as status_accounts diff --git a/src/status/profile/profile.nim b/src/status/profile/profile.nim index ced64e8306..102b530ce9 100644 --- a/src/status/profile/profile.nim +++ b/src/status/profile/profile.nim @@ -1,5 +1,5 @@ import json -import ../libstatus/types +import ../types type Profile* = ref object id*, alias*, username*, identicon*, address*, ensName*, localNickname*: string diff --git a/src/status/settings.nim b/src/status/settings.nim index 3515472f3d..371c93c668 100644 --- a/src/status/settings.nim +++ b/src/status/settings.nim @@ -8,7 +8,7 @@ import ../eventemitter import signals/types #TODO: temporary? -import libstatus/types as LibStatusTypes +import types as LibStatusTypes type SettingsModel* = ref object diff --git a/src/status/signals/communities.nim b/src/status/signals/communities.nim index 02f920b437..83aa0f3421 100644 --- a/src/status/signals/communities.nim +++ b/src/status/signals/communities.nim @@ -1,6 +1,6 @@ import json, strutils, sequtils, sugar, chronicles import json_serialization -import ../libstatus/types as status_types +import ../types as status_types import ../chat/[chat] import types, messages diff --git a/src/status/signals/core.nim b/src/status/signals/core.nim index a1a7a235b2..8d12c12d1c 100644 --- a/src/status/signals/core.nim +++ b/src/status/signals/core.nim @@ -1,5 +1,5 @@ import NimQml, tables, json, chronicles, strutils, json_serialization -import ../libstatus/types as status_types +import ../types as status_types import types, messages, discovery, whisperFilter, envelopes, expired, wallet, mailserver, communities import ../status import ../../eventemitter diff --git a/src/status/signals/messages.nim b/src/status/signals/messages.nim index c80ea9bd32..573ac3b9e1 100644 --- a/src/status/signals/messages.nim +++ b/src/status/signals/messages.nim @@ -5,7 +5,7 @@ import ../libstatus/accounts as status_accounts import ../libstatus/accounts/constants as constants import ../libstatus/settings as status_settings import ../libstatus/tokens as status_tokens -import ../libstatus/types as status_types +import ../types as status_types import ../libstatus/eth/contracts as status_contracts import ../chat/[chat, message] import ../profile/[profile, devices] diff --git a/src/status/signals/types.nim b/src/status/signals/types.nim index bb23ca33b0..75f2e89886 100644 --- a/src/status/signals/types.nim +++ b/src/status/signals/types.nim @@ -1,5 +1,5 @@ import json, chronicles, json_serialization, tables -import ../libstatus/types +import ../types import ../chat/[chat, message] import ../profile/[profile, devices] import ../../eventemitter diff --git a/src/status/status.nim b/src/status/status.nim index 64e89b66ff..a423b06075 100644 --- a/src/status/status.nim +++ b/src/status/status.nim @@ -1,7 +1,7 @@ import libstatus/accounts as libstatus_accounts import libstatus/core as libstatus_core import libstatus/settings as libstatus_settings -import libstatus/types as libstatus_types +import types as libstatus_types import chat, accounts, wallet, node, network, messages, contacts, profile, stickers, permissions, fleet, settings, mailservers import ../eventemitter import ./tasks/task_runner_impl diff --git a/src/status/stickers.nim b/src/status/stickers.nim index 9a07a25ebb..8713c5873b 100644 --- a/src/status/stickers.nim +++ b/src/status/stickers.nim @@ -5,7 +5,7 @@ import # project deps chronicles, web3/[ethtypes, conversions], stint import # local deps - libstatus/types, libstatus/eth/contracts as status_contracts, + 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 diff --git a/src/status/tasks/marathon/mailserver/model.nim b/src/status/tasks/marathon/mailserver/model.nim index 91ce07d675..57a2265c3e 100644 --- a/src/status/tasks/marathon/mailserver/model.nim +++ b/src/status/tasks/marathon/mailserver/model.nim @@ -7,7 +7,7 @@ import ../../../libstatus/settings as status_settings, ../../../libstatus/mailservers as status_mailservers, ../../../libstatus/core as status_core, ../../../libstatus/chat as status_chat, - ../../../libstatus/types, ../../../fleet, + ../../../types, ../../../fleet, ./events as mailserver_events logScope: diff --git a/src/status/transactions.nim b/src/status/transactions.nim index c4f7e1f13a..5fb7f436bb 100644 --- a/src/status/transactions.nim +++ b/src/status/transactions.nim @@ -5,7 +5,7 @@ import stint, web3/ethtypes import - libstatus/types + types from libstatus/utils as status_utils import toUInt64, gwei2Wei, parseAddress proc buildTransaction*(source: Address, value: Uint256, gas = "", gasPrice = "", data = ""): EthSend = diff --git a/src/status/libstatus/types.nim b/src/status/types.nim similarity index 97% rename from src/status/libstatus/types.nim rename to src/status/types.nim index 787949864a..0c325cb1c8 100644 --- a/src/status/libstatus/types.nim +++ b/src/status/types.nim @@ -1,11 +1,7 @@ -import # std libs - json, options, typetraits, tables, sequtils, strutils - -import # vendor libs - web3/ethtypes, json_serialization, stint - -import # status-desktop libs - accounts/constants, ../../eventemitter +import json, options, typetraits, tables, sequtils +import web3/ethtypes, json_serialization, stint +import libstatus/accounts/constants +import ../eventemitter type SignalType* {.pure.} = enum Message = "messages.new" @@ -270,3 +266,4 @@ proc getNodes*(self: FleetConfig, fleet: Fleet, nodeType: FleetNodes = FleetNode proc getMailservers*(self: FleetConfig, fleet: Fleet): Table[string, string] = result = self.fleet[$fleet][$FleetNodes.Mailservers] + diff --git a/src/status/wallet.nim b/src/status/wallet.nim index 866a3e720e..2da73a0aae 100644 --- a/src/status/wallet.nim +++ b/src/status/wallet.nim @@ -10,7 +10,7 @@ import libstatus/wallet as status_wallet import libstatus/accounts/constants as constants import libstatus/eth/[eth, contracts] from libstatus/core import getBlockByNumber -from libstatus/types import PendingTransactionType, GeneratedAccount, DerivedAccount, Transaction, Setting, GasPricePrediction, `%`, StatusGoException, Network, RpcResponse, RpcException +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 import wallet/[balance_manager, account, collectibles] import transactions diff --git a/src/status/wallet/account.nim b/src/status/wallet/account.nim index c11df4a0a9..352c891ecc 100644 --- a/src/status/wallet/account.nim +++ b/src/status/wallet/account.nim @@ -1,5 +1,5 @@ from ../../eventemitter import Args -import ../libstatus/types +import ../types import options type CollectibleList* = ref object diff --git a/src/status/wallet/balance_manager.nim b/src/status/wallet/balance_manager.nim index 6a83d7f742..fc983735a2 100644 --- a/src/status/wallet/balance_manager.nim +++ b/src/status/wallet/balance_manager.nim @@ -1,7 +1,7 @@ import strformat, strutils, stint, httpclient, json, chronicles, net import ../libstatus/wallet as status_wallet import ../libstatus/tokens as status_tokens -import ../libstatus/types as status_types +import ../types as status_types import ../utils/cache import account import options diff --git a/src/status/wallet/collectibles.nim b/src/status/wallet/collectibles.nim index 989e388b02..8f43798fcd 100644 --- a/src/status/wallet/collectibles.nim +++ b/src/status/wallet/collectibles.nim @@ -7,7 +7,7 @@ import # vendor libs import # status-desktop libs ../libstatus/core as status, ../libstatus/eth/contracts as contracts, - ../libstatus/stickers as status_stickers, ../libstatus/types, + ../libstatus/stickers as status_stickers, ../types, web3/[conversions, ethtypes], ../libstatus/utils, account const CRYPTOKITTY* = "cryptokitty" diff --git a/vendor/status-go b/vendor/status-go index 43fa2edc1e..10becb4902 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 43fa2edc1e6e0afa65724d47a95d47cd28c21d85 +Subproject commit 10becb490228d416ff361bdb8a965537b4803af5