don't increase seqno when anonymizing (#734)

This commit is contained in:
Jacek Sieka 2022-06-30 09:56:49 +02:00 committed by GitHub
parent 5d7024f2e0
commit 597abddba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 20 deletions

View File

@ -187,22 +187,18 @@ method publish*(f: FloodSub,
debug "No peers for topic, skipping publish", topic debug "No peers for topic, skipping publish", topic
return 0 return 0
inc f.msgSeqno
let let
msg = msg =
if f.anonymize: if f.anonymize:
Message.init(none(PeerInfo), data, topic, none(uint64), false) Message.init(none(PeerInfo), data, topic, none(uint64), false)
else: else:
inc f.msgSeqno
Message.init(some(f.peerInfo), data, topic, some(f.msgSeqno), f.sign) Message.init(some(f.peerInfo), data, topic, some(f.msgSeqno), f.sign)
msgIdResult = f.msgIdProvider(msg) msgId = f.msgIdProvider(msg).valueOr:
if msgIdResult.isErr:
trace "Error generating message id, skipping publish", trace "Error generating message id, skipping publish",
error = msgIdResult.error error = error
return 0 return 0
let msgId = msgIdResult.get
trace "Created new message", trace "Created new message",
msg = shortLog(msg), peers = peers.len, topic, msgId msg = shortLog(msg), peers = peers.len, topic, msgId

View File

@ -527,23 +527,19 @@ method publish*(g: GossipSub,
libp2p_gossipsub_failed_publish.inc() libp2p_gossipsub_failed_publish.inc()
return 0 return 0
inc g.msgSeqno
let let
msg = msg =
if g.anonymize: if g.anonymize:
Message.init(none(PeerInfo), data, topic, none(uint64), false) Message.init(none(PeerInfo), data, topic, none(uint64), false)
else: else:
inc g.msgSeqno
Message.init(some(g.peerInfo), data, topic, some(g.msgSeqno), g.sign) Message.init(some(g.peerInfo), data, topic, some(g.msgSeqno), g.sign)
msgIdResult = g.msgIdProvider(msg) msgId = g.msgIdProvider(msg).valueOr:
if msgIdResult.isErr:
trace "Error generating message id, skipping publish", trace "Error generating message id, skipping publish",
error = msgIdResult.error error = error
libp2p_gossipsub_failed_publish.inc() libp2p_gossipsub_failed_publish.inc()
return 0 return 0
let msgId = msgIdResult.get
logScope: msgId = shortLog(msgId) logScope: msgId = shortLog(msgId)
trace "Created new message", msg = shortLog(msg), peers = peers.len trace "Created new message", msg = shortLog(msg), peers = peers.len