From f97d151aec44abe8a0de954f3426f1f6a3f345d9 Mon Sep 17 00:00:00 2001
From: vyzo <vyzo@hackzen.org>
Date: Fri, 3 Apr 2020 22:46:14 +0300
Subject: [PATCH] eagerly send gossip at the end heartbeat

instead of trying to piggyback with outgoing messages
---
 gossipsub.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gossipsub.go b/gossipsub.go
index dbc88d1..f686249 100644
--- a/gossipsub.go
+++ b/gossipsub.go
@@ -833,10 +833,6 @@ func (gs *GossipSubRouter) heartbeat() {
 
 	gs.heartbeatTicks++
 
-	// flush pending control message from retries and gossip
-	// that hasn't been piggybacked since the last heartbeat
-	gs.flush()
-
 	tograft := make(map[peer.ID][]string)
 	toprune := make(map[peer.ID][]string)
 	noPX := make(map[peer.ID]bool)
@@ -960,6 +956,9 @@ func (gs *GossipSubRouter) heartbeat() {
 	// send coalesced GRAFT/PRUNE messages (will piggyback gossip)
 	gs.sendGraftPrune(tograft, toprune, noPX)
 
+	// flush all pending gossip that wasn't piggybacked above
+	gs.flush()
+
 	// advance the message history window
 	gs.mcache.Shift()
 }
@@ -1081,14 +1080,14 @@ func (gs *GossipSubRouter) emitGossip(topic string, exclude map[peer.ID]struct{}
 }
 
 func (gs *GossipSubRouter) flush() {
-	// send gossip first, which will also piggyback control
+	// send gossip first, which will also piggyback pending control
 	for p, ihave := range gs.gossip {
 		delete(gs.gossip, p)
 		out := rpcWithControl(nil, ihave, nil, nil, nil)
 		gs.sendRPC(p, out)
 	}
 
-	// send the remaining control messages
+	// send the remaining control messages that wasn't merged with gossip
 	for p, ctl := range gs.control {
 		delete(gs.control, p)
 		out := rpcWithControl(nil, nil, nil, ctl.Graft, ctl.Prune)