status-im/nim-libp2p
2
0
Fork 0
mirror of https://github.com/status-im/nim-libp2p.git synced 2025-02-09 19:44:45 +00:00
Code Issues Projects Releases Wiki Activity

small fixes, publish still half broken

Browse Source
This commit is contained in:
Giovanni Petrantoni 2020-06-26 16:06:08 +09:00
parent ec5c0b867d
commit 03801fcc52
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,13 +53,13 @@ const
type type
GossipSubParams* = object GossipSubParams* = object
pruneBackoff: Duration pruneBackoff*: Duration
floodPublish: bool floodPublish*: bool
gossipFactor: float gossipFactor*: float
dScore: int dScore*: int
dOut: int dOut*: int
publishThreshold: float publishThreshold*: float
GossipSub* = ref object of FloodSub GossipSub* = ref object of FloodSub
parameters*: GossipSubParams parameters*: GossipSubParams
@ -87,6 +87,7 @@ proc init*(_: type[GossipSubParams]): GossipSubParams =
gossipFactor: 0.25, gossipFactor: 0.25,
dScore: 4, dScore: 4,
dOut: 2, dOut: 2,
publishThreshold: 1.0,
) )
method init*(g: GossipSub) = method init*(g: GossipSub) =
@ -524,7 +525,7 @@ method publish*(g: GossipSub,
topic: string, topic: string,
data: seq[byte]) {.async.} = data: seq[byte]) {.async.} =
await procCall PubSub(g).publish(topic, data) await procCall PubSub(g).publish(topic, data)
trace "about to publish message on topic", name = topic, debug "about to publish message on topic", name = topic,
data = data.shortLog data = data.shortLog
# directly copy explicit peers # directly copy explicit peers
# as we will always publish to those # as we will always publish to those
@ -535,6 +536,7 @@ method publish*(g: GossipSub,
for id, peer in g.peers: for id, peer in g.peers:
if peer.topics.find(topic) != -1 and if peer.topics.find(topic) != -1 and
peer.score() >= g.parameters.publishThreshold: peer.score() >= g.parameters.publishThreshold:
debug "publish: including flood/high score peer", peer = id
peers.incl(id) peers.incl(id)
if topic in g.topics: # if we're subscribed to the topic attempt to build a mesh if topic in g.topics: # if we're subscribed to the topic attempt to build a mesh
@ -548,9 +550,9 @@ method publish*(g: GossipSub,
g.lastFanoutPubSub[topic] = Moment.fromNow(GossipSubFanoutTTL) g.lastFanoutPubSub[topic] = Moment.fromNow(GossipSubFanoutTTL)
let msg = newMessage(g.peerInfo, data, topic, g.sign) let msg = newMessage(g.peerInfo, data, topic, g.sign)
trace "created new message", msg debug "created new message", msg
trace "publishing on topic", name = topic debug "publishing on topic", name = topic
if msg.msgId notin g.mcache: if msg.msgId notin g.mcache:
g.mcache.put(msg) g.mcache.put(msg)
@ -561,7 +563,10 @@ method publish*(g: GossipSub,
continue continue
let peer = g.peers.getOrDefault(p) let peer = g.peers.getOrDefault(p)
if not isNil(peer.peerInfo): if not isNil(peer.peerInfo):
sent.add(g.peers[p].send(@[RPCMsg(messages: @[msg])])) debug "publish: sending message to peer", peer = p
sent.add(peer.send(@[RPCMsg(messages: @[msg])]))
else:
debug "gossip peer's peerInfo was nil!", peer = p
checkFutures(await allFinished(sent)) checkFutures(await allFinished(sent))