Skip to content

Commit

Permalink
remove vendor/nim-nat-traversal
Browse files Browse the repository at this point in the history
and fix/hide some warnings
  • Loading branch information
stefantalpalaru authored and iurimatias committed Jun 23, 2020
1 parent c6a1e3d commit 150f38b
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 20 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "vendor/nimbus-build-system"]
path = vendor/nimbus-build-system
url = https://github.com/status-im/nimbus-build-system.git
[submodule "vendor/nim-nat-traversal"]
path = vendor/nim-nat-traversal
url = https://github.com/status-im/nim-nat-traversal.git
[submodule "vendor/nim-stew"]
path = vendor/nim-stew
url = https://github.com/status-im/nim-stew.git
Expand Down
8 changes: 8 additions & 0 deletions config.nims
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,11 @@ else:
switch("passL", "-Wl,-as-needed")

--define:chronicles_line_numbers # useful when debugging

# The compiler doth protest too much, methinks, about all these cases where it can't
# do its (N)RVO pass: https://github.com/nim-lang/RFCs/issues/230
switch("warning", "ObservableStores:off")

# Too many false positives for "Warning: method has lock level <unknown>, but another method has 0 [LockLevel]"
switch("warning", "LockLevel:off")

9 changes: 3 additions & 6 deletions src/app/chat/views/chat_members.nim
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import NimQml, Tables
import ../../../status/chat/[chat, message]
import ../../../status/chat as status_chat
import ../../../status/status
import ../../../status/ens
import NimQml, Tables,
../../../status/[chat/chat, status, ens]

type
ChatMemberRoles {.pure.} = enum
Expand All @@ -20,7 +17,7 @@ QtObject:

proc setup(self: ChatMembersView) = self.QAbstractListModel.setup

proc delete(self: ChatMembersView) =
proc delete(self: ChatMembersView) =
self.members = @[]
self.QAbstractListModel.delete

Expand Down
5 changes: 2 additions & 3 deletions src/app/profile/views/contact_list.nim
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import NimQml
import Tables
import strformat
import ../../../status/profile/profile
from ../../../status/ens import nil

Expand All @@ -18,14 +17,14 @@ QtObject:

proc setup(self: ContactList) = self.QAbstractListModel.setup

proc delete(self: ContactList) =
proc delete(self: ContactList) =
self.contacts = @[]
self.QAbstractListModel.delete

proc newContactList*(): ContactList =
new(result, delete)
# TODO: (rramos) contacts should be a table[string, Profile] instead, with the key being the public key
# This is to optimize determining if a contact is part of the contact list or not
# This is to optimize determining if a contact is part of the contact list or not
# (including those that do not have a system tag)
result.contacts = @[]
result.setup
Expand Down
4 changes: 2 additions & 2 deletions src/app/profile/views/mailservers_list.nim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import NimQml
import Tables
import ../../../status/profile/[profile, mailserver]
import ../../../status/profile/mailserver

type
MailServerRoles {.pure.} = enum
Expand All @@ -13,7 +13,7 @@ QtObject:

proc setup(self: MailServersList) = self.QAbstractListModel.setup

proc delete(self: MailServersList) =
proc delete(self: MailServersList) =
self.mailservers = @[]
self.QAbstractListModel.delete

Expand Down
5 changes: 2 additions & 3 deletions src/status/libstatus/contracts.nim
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import sequtils, strformat, sugar, chronicles, typeinfo, macros, tables
import ./utils as status_utils
import sequtils, strformat, sugar, macros, tables
import eth/common/eth_types, stew/byteutils, nimcrypto
from eth/common/utils import parseAddress

Expand All @@ -12,7 +11,7 @@ type Method = object
name: string
signature: string
noPadding: bool

type Contract* = ref object
name*: string
network*: Network
Expand Down
2 changes: 1 addition & 1 deletion src/status/libstatus/types.nim
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ type AccountArgs* = ref object of Args
account*: Account

type
StatusGoException* = object of Exception
StatusGoException* = object of CatchableError

type
Transaction* = ref object
Expand Down
1 change: 0 additions & 1 deletion vendor/nim-nat-traversal
Submodule nim-nat-traversal deleted from 2403c3
2 changes: 1 addition & 1 deletion vendor/nimbus-build-system

0 comments on commit 150f38b

Please sign in to comment.