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

fix: marking a mailserver as trusted is not necessary as this is done by status-go already

This commit is contained in:
Richard Ramos 2021-03-09 16:28:11 -04:00 committed by Iuri Matias
parent 49b5e6c097
commit 3c024db15e
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/status/mailservers.nim
View File

@ -36,7 +36,6 @@ type
Disconnected = 0, Disconnected = 0,
Connecting = 1 Connecting = 1
Connected = 2, Connected = 2,
Trusted = 3,
MailserverModel* = ref object MailserverModel* = ref object
mailservers*: seq[string] mailservers*: seq[string]
@ -76,10 +75,6 @@ proc newMailserverModel*(fleet: FleetModel, events: EventEmitter): MailserverMod
activeMailserverLock.initLock() activeMailserverLock.initLock()
proc trustPeer(self: MailserverModel, enode:string) =
markTrustedPeer(enode)
self.nodes[enode] = MailserverStatus.Trusted
proc getActiveMailserver*(self:MailserverModel): string = proc getActiveMailserver*(self:MailserverModel): string =
withLock activeMailserverLock: withLock activeMailserverLock:
result = self.activeMailserver result = self.activeMailserver
@ -91,7 +86,7 @@ proc isActiveMailserverAvailable*(self:MailserverModel): bool =
if not self.nodes.hasKey(self.activeMailserver): if not self.nodes.hasKey(self.activeMailserver):
result = false result = false
else: else:
result = self.nodes[self.activeMailserver] == MailserverStatus.Trusted result = self.nodes[self.activeMailserver] == MailserverStatus.Connected
nodesLock.release() nodesLock.release()
activeMailserverLock.release() activeMailserverLock.release()
@ -99,7 +94,7 @@ proc isActiveMailserverAvailable*(self:MailserverModel): bool =
proc connect(self: MailserverModel, enode: string) = proc connect(self: MailserverModel, enode: string) =
debug "Connecting to mailserver", enode=enode.substr[enode.len-40..enode.len-1] debug "Connecting to mailserver", enode=enode.substr[enode.len-40..enode.len-1]
var mailserverTrusted = false var connected = false
# TODO: this should come from settings # TODO: this should come from settings
var knownMailservers = initHashSet[string]() var knownMailservers = initHashSet[string]()
for m in self.mailservers: for m in self.mailservers:
@ -114,16 +109,15 @@ proc connect(self: MailserverModel, enode: string) =
self.activeMailserver = enode self.activeMailserver = enode
self.events.emit("mailserver:changed", Args()) self.events.emit("mailserver:changed", Args())
# Adding a peer and marking it as trusted can't be executed sync, because # Adding a peer and marking it as connected can't be executed sync, because
# There's a delay between requesting a peer being added, and a signal being # There's a delay between requesting a peer being added, and a signal being
# received after the peer was added. So we first set the peer status as # received after the peer was added. So we first set the peer status as
# Connecting and once a peerConnected signal is received, we mark it as # Connecting and once a peerConnected signal is received, we mark it as
# Connected and then as Trusted # Connected
if self.nodes.hasKey(enode) and self.nodes[enode] == MailserverStatus.Connected: if self.nodes.hasKey(enode) and self.nodes[enode] == MailserverStatus.Connected:
self.trustPeer(enode)
status_mailservers.update(enode) status_mailservers.update(enode)
mailserverTrusted = true connected = true
else: else:
# Attempt to connect to mailserver by adding it as a peer # Attempt to connect to mailserver by adding it as a peer
self.nodes[enode] = MailserverStatus.Connecting self.nodes[enode] = MailserverStatus.Connecting
@ -132,7 +126,7 @@ proc connect(self: MailserverModel, enode: string) =
nodesLock.release() nodesLock.release()
activeMailserverLock.release() activeMailserverLock.release()
if mailserverTrusted: if connected:
self.events.emit("mailserverAvailable", Args()) self.events.emit("mailserverAvailable", Args())
@ -156,7 +150,7 @@ proc peerSummaryChange*(self: MailserverModel, peers: seq[string]) =
self.activeMailserver = "" self.activeMailserver = ""
for peer in peers: for peer in peers:
if self.nodes.hasKey(peer) and (self.nodes[peer] == MailserverStatus.Connected or self.nodes[peer] == MailserverStatus.Trusted): continue if self.nodes.hasKey(peer) and (self.nodes[peer] == MailserverStatus.Connected): continue
debug "Peer connected", peer debug "Peer connected", peer
self.nodes[peer] = MailserverStatus.Connected self.nodes[peer] = MailserverStatus.Connected
self.events.emit("peerConnected", MailserverArg(peer: peer)) self.events.emit("peerConnected", MailserverArg(peer: peer))
@ -164,7 +158,6 @@ proc peerSummaryChange*(self: MailserverModel, peers: seq[string]) =
withLock activeMailserverLock: withLock activeMailserverLock:
if peer == self.activeMailserver: if peer == self.activeMailserver:
if self.nodes.hasKey(self.activeMailserver): if self.nodes.hasKey(self.activeMailserver):
self.trustPeer(peer)
if self.activeMailserver == peer: if self.activeMailserver == peer:
mailserverAvailable = true mailserverAvailable = true