p2p: resolved deadlock on p2p server shutdown

eth/handler.go

@@ -381,8 +381,6 @@ func (h *handler) protoTracker() {
 				<-h.handlerDoneCh
 			}
 			return
-		case <-h.stopCh:
-			return
 		}
 	}
 }

eth/sync.go

@@ -132,8 +132,6 @@ func (cs *chainSyncer) loop() {
 				<-cs.doneCh
 			}
 			return
-		case <-cs.handler.stopCh:
-			return
 		}
 	}
 }

p2p/server.go

@@ -65,9 +65,6 @@ const (
 
 	// Maximum amount of time allowed for writing a complete message.
 	frameWriteTimeout = 20 * time.Second
-
-	// Maximum time to wait before stop the p2p server
-	stopTimeout = 5 * time.Second
 )
 
 var (
@@ -457,7 +454,7 @@ func (srv *Server) Stop() {
 
 	select {
 	case <-stopChan:
-	case <-time.After(stopTimeout):
+	case <-time.After(defaultDialTimeout): // we should use defaultDialTimeout as we can dial just before the shutdown
 		srv.log.Warn("stop p2p server timeout, forcing stop")
 	}
 }

p2p/server_test.go

@@ -223,8 +223,8 @@ func TestServerStopTimeout(t *testing.T) {
 
 	select {
 	case <-stopChan:
-	case <-time.After(10 * time.Second):
-		t.Error("server should be shutdown in 10 seconds")
+	case <-time.After(defaultDialTimeout + 1*time.Second):
+		t.Error("server should be shutdown in defaultDialTimeout + 1 seconds")
 	}
 }