From 80e20e63869d34ea6f3606cb7de69122f511b260 Mon Sep 17 00:00:00 2001
From: rafaelss <5679073+r4f4ss@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:39:49 -0300
Subject: [PATCH] fixes go test

---
 p2p/discover/portal_protocol.go | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/p2p/discover/portal_protocol.go b/p2p/discover/portal_protocol.go
index 9ebf078dd1..5547e58a26 100644
--- a/p2p/discover/portal_protocol.go
+++ b/p2p/discover/portal_protocol.go
@@ -1151,27 +1151,25 @@ func (p *PortalProtocol) handleFindContent(id enode.ID, addr *net.UDPAddr, reque
 			var conn *utp.Conn
 			var connectCtx context.Context
 			var cancel context.CancelFunc
-			defer func(clsConn *utp.Conn) {
+			defer func() {
 				p.connIdGen.Remove(connId)
-				if clsConn == nil {
+				if conn == nil {
 					return
 				}
-				err := clsConn.Close()
+				err := conn.Close()
 				if err != nil {
 					p.Log.Error("failed to close connection", "err", err)
 				}
-			}(conn)
-			connectCtx, cancel = context.WithTimeout(bctx, defaultUTPConnectTimeout)
-			defer func(cancelFunc context.CancelFunc) {
-				cancelFunc()
-			}(cancel)
+			}()
 			for {
 				select {
 				case <-bctx.Done():
 					return
 				default:
 					p.Log.Debug("will accept find content conn from: ", "source", addr, "connId", connId)
+					connectCtx, cancel = context.WithTimeout(bctx, defaultUTPConnectTimeout)
 					conn, err = p.utp.AcceptUTPContext(connectCtx, connectionId.SendId())
+					cancel()
 					if err != nil {
 						if metrics.Enabled {
 							p.portalMetrics.utpOutFailConn.Inc(1)
@@ -1285,26 +1283,23 @@ func (p *PortalProtocol) handleOffer(id enode.ID, addr *net.UDPAddr, request *po
 			var conn *utp.Conn
 			var connectCtx context.Context
 			var cancel context.CancelFunc
-			defer func(clsConn *utp.Conn) {
+			defer func() {
 				p.connIdGen.Remove(connId)
-				if clsConn == nil {
+				if conn == nil {
 					return
 				}
-				err := clsConn.Close()
+				err := conn.Close()
 				if err != nil {
 					p.Log.Error("failed to close connection", "err", err)
 				}
-			}(conn)
-			connectCtx, cancel = context.WithTimeout(bctx, defaultUTPConnectTimeout)
-			defer func(cancelFunc context.CancelFunc) {
-				cancelFunc()
-			}(cancel)
+			}()
 			for {
 				select {
 				case <-bctx.Done():
 					return
 				default:
 					p.Log.Debug("will accept offer conn from: ", "source", addr, "connId", connId)
+					connectCtx, cancel = context.WithTimeout(bctx, defaultUTPConnectTimeout)
 					conn, err = p.utp.AcceptUTPContext(connectCtx, connectionId.SendId())
 					cancel()
 					if err != nil {