p2p: log remote reason when disconnect is requested

The returned reason is currently not used except for the log
message. This change makes the log messages a bit more useful.
The handshake code also returns the remote reason.

1 files changed, 7 insertions, 6 deletions

diff --git a/p2p/peer_test.go b/p2p/peer_test.go
index fb76818a0..7d17d447c 100644
--- a/p2p/peer_test.go
+++ b/p2p/peer_test.go
@@ -172,12 +172,13 @@ func TestPeerDisconnect(t *testing.T) {
 	if err := SendItems(rw, discMsg, DiscQuitting); err != nil {
 		t.Fatal(err)
 	}
-	if err := ExpectMsg(rw, discMsg, []interface{}{DiscRequested}); err != nil {
-		t.Error(err)
-	}
-	closer()
-	if reason := <-disc; reason != DiscRequested {
-		t.Errorf("run returned wrong reason: got %v, want %v", reason, DiscRequested)
+	select {
+	case reason := <-disc:
+		if reason != DiscQuitting {
+			t.Errorf("run returned wrong reason: got %v, want %v", reason, DiscRequested)
+		}
+	case <-time.After(500 * time.Millisecond):
+		t.Error("peer did not return")
 	}
 }