simplify starting of the dialWorkerLoop

libp2p · Aug 27, 2021 · 1bf84f7 · 1bf84f7
1 parent 62d5d6f
commit 1bf84f7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/dial_sync.go b/dial_sync.go
@@ -93,7 +93,7 @@ func (ds *DialSync) getActiveDial(p peer.ID) (*activeDial, error) {
 			reqch:  make(chan dialRequest),
 			ds:     ds,
 		}
-		ds.dialWorker(p, actd.reqch)
+		go ds.dialWorker(p, actd.reqch)
 		ds.dials[p] = actd
 	}
 

diff --git a/swarm.go b/swarm.go
@@ -122,7 +122,7 @@ func NewSwarm(ctx context.Context, local peer.ID, peers peerstore.Peerstore, bwc
 		}
 	}
 
-	s.dsync = newDialSync(s.startDialWorker)
+	s.dsync = newDialSync(s.dialWorkerLoop)
 	s.limiter = newDialLimiter(s.dialAddr)
 	s.proc = goprocessctx.WithContext(ctx)
 	s.ctx = goprocessctx.OnClosingContext(s.proc)

diff --git a/swarm_dial.go b/swarm_dial.go
@@ -294,11 +294,7 @@ type dialResponse struct {
 	err  error
 }
 
-// startDialWorker starts an active dial goroutine that synchronizes and executes concurrent dials to a single peer
-func (s *Swarm) startDialWorker(p peer.ID, reqch <-chan dialRequest) {
-	go s.dialWorkerLoop(p, reqch)
-}
-
+// dialWorkerLoop synchronizes and executes concurrent dials to a single peer
 func (s *Swarm) dialWorkerLoop(p peer.ID, reqch <-chan dialRequest) {
 	defer s.limiter.clearAllPeerDials(p)