From 490e0d0f46644e9aa91c4ba7306676b501c3130a Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 4 Oct 2017 20:33:03 -0700 Subject: [PATCH] discovery: broadcast OG chan ann in retransmitStaleChannels --- discovery/gossiper.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/discovery/gossiper.go b/discovery/gossiper.go index b4ef3590..aa970366 100644 --- a/discovery/gossiper.go +++ b/discovery/gossiper.go @@ -529,11 +529,18 @@ func (d *AuthenticatedGossiper) retransmitStaleChannels() error { for _, chanToUpdate := range edgesToUpdate { // Re-sign and update the channel on disk and retrieve our // ChannelUpdate to broadcast. - chanUpdate, err := d.updateChannel(chanToUpdate.info, + chanAnn, chanUpdate, err := d.updateChannel(chanToUpdate.info, chanToUpdate.edge) if err != nil { return fmt.Errorf("unable to update channel: %v", err) } + + // If we have a valid announcement to transmit, then we'll send + // that along with the update. + if chanAnn != nil { + signedUpdates = append(signedUpdates, chanAnn) + } + signedUpdates = append(signedUpdates, chanUpdate) } @@ -543,9 +550,7 @@ func (d *AuthenticatedGossiper) retransmitStaleChannels() error { return nil } - log.Infof("Retransmitting %v outgoing channels", len(signedUpdates)) - - // TODO(roasbeef): also send the channel ann? + log.Infof("Retransmitting %v outgoing channels", len(edgesToUpdate)) // With all the wire announcements properly crafted, we'll broadcast // our known outgoing channels to all our immediate peers. @@ -595,13 +600,12 @@ func (d *AuthenticatedGossiper) processFeeChanUpdate(feeUpdate *feeUpdateRequest // Re-sign and update the backing ChannelGraphSource, and // retrieve our ChannelUpdate to broadcast. - chanUpdate, err := d.updateChannel(info, edge) + _, chanUpdate, err := d.updateChannel(info, edge) if err != nil { return err } chanUpdates = append(chanUpdates, chanUpdate) - return nil }) if err != nil {