graph: ensure that topology subscription cancelation is blocking

We want to ensure that when a caller cancels a topology subscription,
then any channel/node updates after that are not notified on the
subscription. To ensure this, we make the Cancel function blocking.

Author: ellemouton

graph/notifications.go

@@ -83,14 +83,25 @@ func (b *Builder) SubscribeTopology() (*TopologyClient, error) {
 	return &TopologyClient{
 		TopologyChanges: ntfnChan,
 		Cancel: func() {
+			// Send the cancellation request.
+			cancelChan := make(chan *TopologyChange)
 			select {
 			case b.ntfnClientUpdates <- &topologyClientUpdate{
 				cancel:   true,
 				clientID: clientID,
+				ntfnChan: cancelChan,
 			}:
 			case <-b.quit:
 				return
 			}
+
+			// Block until the cancellation is complete.
+			select {
+			case <-cancelChan:
+			case <-b.quit:
+			}
+
+			return
 		},
 	}, nil
 }