From 1941b5c769f0fde2ca68ae087705163dd6fc42e5 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Thu, 8 Mar 2018 15:55:23 +0400
Subject: [PATCH] fixes from @xla's review

---
 p2p/pex/pex_reactor.go | 62 ++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go
index b358bd486..4d85259fc 100644
--- a/p2p/pex/pex_reactor.go
+++ b/p2p/pex/pex_reactor.go
@@ -341,38 +341,9 @@ func (r *PEXReactor) ensurePeers() {
 		toDial[try.ID] = try
 	}
 
-	// 1s == (1e9 ns) == (1 Billion ns)
-	billionNs := float64(time.Second.Nanoseconds())
-
 	// Dial picked addresses
 	for _, addr := range toDial {
-		go func(picked *p2p.NetAddress) {
-			// exponential backoff if it's not our first attempt to dial picked address
-			var attempt int
-			if lAttempt, notFirstAttempt := r.attemptsToDial.Load(picked.DialString()); notFirstAttempt {
-				attempt = lAttempt.(int)
-				jitterSeconds := time.Duration(rand.Float64() * billionNs)
-				backoffDuration := jitterSeconds + ((1 << uint(attempt)) * time.Second)
-				r.Logger.Debug(fmt.Sprintf("Dialing %v", picked), "attempt", attempt, "backoff_duration", backoffDuration)
-				time.Sleep(backoffDuration)
-			}
-
-			err := r.Switch.DialPeerWithAddress(picked, false)
-			if err != nil {
-				r.Logger.Error("Dialing failed", "err", err)
-				// TODO: detect more "bad peer" scenarios
-				if _, ok := err.(p2p.ErrSwitchAuthenticationFailure); ok {
-					r.book.MarkBad(picked)
-				} else {
-					r.book.MarkAttempt(picked)
-				}
-				// record attempt
-				r.attemptsToDial.Store(picked.DialString(), attempt+1)
-			} else {
-				// cleanup any history
-				r.attemptsToDial.Delete(picked.DialString())
-			}
-		}(addr)
+		go r.dialPeer(addr)
 	}
 
 	// If we need more addresses, pick a random peer and ask for more.
@@ -393,6 +364,37 @@ func (r *PEXReactor) ensurePeers() {
 	}
 }
 
+func (r *PEXReactor) dialPeer(addr *p2p.NetAddress) {
+	// 1s == (1e9 ns) == (1 Billion ns)
+	billionNs := float64(time.Second.Nanoseconds())
+
+	// exponential backoff if it's not our first attempt to dial given address
+	var attempts int
+	if lAttempts, attempted := r.attemptsToDial.Load(addr.DialString()); attempted {
+		attempts = lAttempts.(int)
+		jitterSeconds := time.Duration(rand.Float64() * billionNs)
+		backoffDuration := jitterSeconds + ((1 << uint(attempts)) * time.Second)
+		r.Logger.Debug(fmt.Sprintf("Dialing %v", addr), "attempts", attempts, "backoff_duration", backoffDuration)
+		time.Sleep(backoffDuration)
+	}
+
+	err := r.Switch.DialPeerWithAddress(addr, false)
+	if err != nil {
+		r.Logger.Error("Dialing failed", "err", err)
+		// TODO: detect more "bad peer" scenarios
+		if _, ok := err.(p2p.ErrSwitchAuthenticationFailure); ok {
+			r.book.MarkBad(addr)
+		} else {
+			r.book.MarkAttempt(addr)
+		}
+		// record attempt
+		r.attemptsToDial.Store(addr.DialString(), attempts+1)
+	} else {
+		// cleanup any history
+		r.attemptsToDial.Delete(addr.DialString())
+	}
+}
+
 // check seed addresses are well formed
 func (r *PEXReactor) checkSeeds() error {
 	lSeeds := len(r.config.Seeds)