From e51235114571541db0a2f87ac548de19fb4282e7 Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 13 Dec 2019 10:08:26 +0100
Subject: [PATCH] fix: always send the result channel when triggering a refresh

Otherwise, we'll just return a channel that will never be signaled.
---
 dht_bootstrap.go |  5 +----
 dht_test.go      | 42 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/dht_bootstrap.go b/dht_bootstrap.go
index 7078765e0..31364927f 100644
--- a/dht_bootstrap.go
+++ b/dht_bootstrap.go
@@ -189,9 +189,6 @@ func (dht *IpfsDHT) Bootstrap(_ context.Context) error {
 // error and close. The channel is buffered and safe to ignore.
 func (dht *IpfsDHT) RefreshRoutingTable() <-chan error {
 	res := make(chan error, 1)
-	select {
-	case dht.triggerRtRefresh <- res:
-	default:
-	}
+	dht.triggerRtRefresh <- res
 	return res
 }
diff --git a/dht_test.go b/dht_test.go
index f675cc81d..60265e4d7 100644
--- a/dht_test.go
+++ b/dht_test.go
@@ -187,7 +187,6 @@ func connect(t *testing.T, ctx context.Context, a, b *IpfsDHT) {
 }
 
 func bootstrap(t *testing.T, ctx context.Context, dhts []*IpfsDHT) {
-
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
@@ -212,6 +211,47 @@ func bootstrap(t *testing.T, ctx context.Context, dhts []*IpfsDHT) {
 	}
 }
 
+// Check to make sure we always signal the RefreshRoutingTable channel.
+func TestRefreshMultiple(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	dhts := setupDHTS(t, ctx, 5)
+	defer func() {
+		for _, dht := range dhts {
+			dht.Close()
+			defer dht.host.Close()
+		}
+	}()
+
+	for _, dht := range dhts[1:] {
+		connect(t, ctx, dhts[0], dht)
+	}
+
+	a := dhts[0].RefreshRoutingTable()
+	time.Sleep(time.Nanosecond)
+	b := dhts[0].RefreshRoutingTable()
+	time.Sleep(time.Nanosecond)
+	c := dhts[0].RefreshRoutingTable()
+
+	// make sure that all of these eventually return
+	select {
+	case <-a:
+	case <-ctx.Done():
+		t.Fatal("first channel didn't signal")
+	}
+	select {
+	case <-b:
+	case <-ctx.Done():
+		t.Fatal("second channel didn't signal")
+	}
+	select {
+	case <-c:
+	case <-ctx.Done():
+		t.Fatal("third channel didn't signal")
+	}
+}
+
 func TestValueGetSet(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()