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

remove heartbeat assertion, minor debug fixes

This commit is contained in:
Giovanni Petrantoni 2020-09-12 21:05:21 +09:00
parent 3fed781eda
commit e4da3e4f67
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libp2p/protocols/pubsub/gossipsub.nim
View File

@ -304,7 +304,7 @@ proc grafted(g: GossipSub, p: PubSubPeer, topic: string) =
stats.topicInfos[topic] = info stats.topicInfos[topic] = info
assert(g.peerStats[p].topicInfos[topic].inMesh == true) assert(g.peerStats[p].topicInfos[topic].inMesh == true)
debug "grafted", p trace "grafted", p
do: do:
g.onNewPeer(p) g.onNewPeer(p)
g.grafted(p, topic) g.grafted(p, topic)
@ -329,7 +329,7 @@ proc pruned(g: GossipSub, p: PubSubPeer, topic: string) =
# mgetOrPut does not work, so we gotta do this without referencing # mgetOrPut does not work, so we gotta do this without referencing
stats.topicInfos[topic] = info stats.topicInfos[topic] = info
debug "pruned", p trace "pruned", p
proc peerExchangeList(g: GossipSub, topic: string): seq[PeerInfoMsg] = proc peerExchangeList(g: GossipSub, topic: string): seq[PeerInfoMsg] =
var peers = g.gossipsub.getOrDefault(topic, initHashSet[PubSubPeer]()).toSeq() var peers = g.gossipsub.getOrDefault(topic, initHashSet[PubSubPeer]()).toSeq()
@ -705,6 +705,8 @@ proc updateScores(g: GossipSub) = # avoid async
for peer in evicting: for peer in evicting:
g.peerStats.del(peer) g.peerStats.del(peer)
trace "updated scores", peers = g.peers.len
proc heartbeat(g: GossipSub) {.async.} = proc heartbeat(g: GossipSub) {.async.} =
while g.heartbeatRunning: while g.heartbeatRunning:
@ -767,7 +769,6 @@ proc heartbeat(g: GossipSub) {.async.} =
raise exc raise exc
except CatchableError as exc: except CatchableError as exc:
warn "exception ocurred in gossipsub heartbeat", exc = exc.msg, trace = exc.getStackTrace() warn "exception ocurred in gossipsub heartbeat", exc = exc.msg, trace = exc.getStackTrace()
assert(false, "exception ocurred in gossipsub heartbeat")
for trigger in g.heartbeatEvents: for trigger in g.heartbeatEvents:
trace "firing heartbeat event", instance = cast[int](g) trace "firing heartbeat event", instance = cast[int](g)
@ -1026,7 +1027,7 @@ method rpcHandler*(g: GossipSub,
continue continue
if not (await g.validate(msg)): if not (await g.validate(msg)):
trace "Dropping message due to failed validation", msgId, peer debug "Dropping message due to failed validation", msgId, peer
g.punishPeer(peer, msg) g.punishPeer(peer, msg)
continue continue
@ -1071,7 +1072,7 @@ method rpcHandler*(g: GossipSub,
if respControl.graft.len > 0 or respControl.prune.len > 0 or if respControl.graft.len > 0 or respControl.prune.len > 0 or
respControl.ihave.len > 0 or messages.len > 0: respControl.ihave.len > 0 or messages.len > 0:
debug "sending control message", msg = shortLog(respControl), peer trace "sending control message", msg = shortLog(respControl), peer
g.send( g.send(
peer, peer,
RPCMsg(control: some(respControl), messages: messages)) RPCMsg(control: some(respControl), messages: messages))