status-im
/
go-libp2p-pubsub
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

router.Publish doesn't need the source, it takes the whole message now

This commit is contained in:
vyzo 2020-03-04 14:39:44 +02:00
parent 75fd8826af
commit 87bbe69a8b
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
floodsub.go
View File

@ -69,7 +69,9 @@ func (fs *FloodSubRouter) EnoughPeers(topic string, suggested int) bool {
func (fs *FloodSubRouter) HandleRPC(rpc *RPC) {}
func (fs *FloodSubRouter) Publish(from peer.ID, msg *Message) {
func (fs *FloodSubRouter) Publish(msg *Message) {
from := msg.ReceivedFrom
tosend := make(map[peer.ID]struct{})
for _, topic := range msg.GetTopicIDs() {
tmap, ok := fs.p.topics[topic]

5
gossipsub.go
View File

@ -484,8 +484,9 @@ func (gs *GossipSubRouter) connector() {
}
}
func (gs *GossipSubRouter) Publish(from peer.ID, msg *Message) {
func (gs *GossipSubRouter) Publish(msg *Message) {
gs.mcache.Put(msg.Message)
from := msg.ReceivedFrom
tosend := make(map[peer.ID]struct{})
for _, topic := range msg.GetTopicIDs() {
@ -495,7 +496,7 @@ func (gs *GossipSubRouter) Publish(from peer.ID, msg *Message) {
continue
}
if gs.floodPublish && msg.ReceivedFrom == gs.p.host.ID() {
if gs.floodPublish && from == gs.p.host.ID() {
for p := range tmap {
if gs.score.Score(p) >= gs.publishThreshold {
tosend[p] = struct{}{}

4
pubsub.go
View File

@ -155,7 +155,7 @@ type PubSubRouter interface {
// It is invoked after subscriptions and payload messages have been processed.
HandleRPC(*RPC)
// Publish is invoked to forward a new message that has been validated.
Publish(peer.ID, *Message)
Publish(*Message)
// Join notifies the router that we want to receive and forward messages in a topic.
// It is invoked after the subscription announcement.
Join(topic string)
@ -840,7 +840,7 @@ func (p *PubSub) pushMsg(msg *Message) {
func (p *PubSub) publishMessage(msg *Message) {
p.tracer.DeliverMessage(msg)
p.notifySubs(msg)
p.rt.Publish(msg.ReceivedFrom, msg)
p.rt.Publish(msg)
}
type addTopicReq struct {

4
randomsub.go
View File

@ -88,7 +88,9 @@ func (rs *RandomSubRouter) EnoughPeers(topic string, suggested int) bool {
func (rs *RandomSubRouter) HandleRPC(rpc *RPC) {}
func (rs *RandomSubRouter) Publish(from peer.ID, msg *Message) {
func (rs *RandomSubRouter) Publish(msg *Message) {
from := msg.ReceivedFrom
tosend := make(map[peer.ID]struct{})
rspeers := make(map[peer.ID]struct{})
src := peer.ID(msg.GetFrom())