refactor: omit unnecessary reassignment (#17518)

Inspired by PR #17147, and
replaced additional cases as well.

Signed-off-by: spuradage <[email protected]>

Author: spuradage

p2p/discover/v5wire/encoding_test.go

@@ -386,7 +386,6 @@ func TestTestVectorsV5(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run(test.name, func(t *testing.T) {
 			net := newHandshakeTest(tmpDir, logger)
 			defer net.close()

p2p/peer.go

@@ -436,7 +436,6 @@ outer:
 func (p *Peer) startProtocols(writeStart <-chan struct{}, writeErr chan<- error) {
 	p.wg.Add(len(p.running))
 	for _, proto := range p.running {
-		proto := proto
 		proto.closed = p.closed
 		proto.wstart = writeStart
 		proto.werr = writeErr

p2p/sentry/libsentry/sentrymultiplexer.go

@@ -64,7 +64,6 @@ func (m *sentryMultiplexer) SetStatus(ctx context.Context, in *sentryproto.Statu
 	g, gctx := errgroup.WithContext(ctx)
 
 	for _, client := range m.clients {
-		client := client
 
 		client.RLock()
 		protocol := client.protocol
@@ -91,7 +90,6 @@ func (m *sentryMultiplexer) PenalizePeer(ctx context.Context, in *sentryproto.Pe
 	g, gctx := errgroup.WithContext(ctx)
 
 	for _, client := range m.clients {
-		client := client
 
 		g.Go(func() error {
 			_, err := client.PenalizePeer(gctx, in, opts...)
@@ -106,7 +104,6 @@ func (m *sentryMultiplexer) SetPeerLatestBlock(ctx context.Context, in *sentrypr
 	g, gctx := errgroup.WithContext(ctx)
 
 	for _, client := range m.clients {
-		client := client
 
 		g.Go(func() error {
 			_, err := client.SetPeerLatestBlock(gctx, in, opts...)
@@ -121,7 +118,6 @@ func (m *sentryMultiplexer) SetPeerMinimumBlock(ctx context.Context, in *sentryp
 	g, gctx := errgroup.WithContext(ctx)
 
 	for _, client := range m.clients {
-		client := client
 
 		g.Go(func() error {
 			_, err := client.SetPeerMinimumBlock(gctx, in, opts...)
@@ -136,7 +132,6 @@ func (m *sentryMultiplexer) SetPeerBlockRange(ctx context.Context, in *sentrypro
 	g, gctx := errgroup.WithContext(ctx)
 
 	for _, client := range m.clients {
-		client := client
 
 		g.Go(func() error {
 			_, err := client.SetPeerBlockRange(gctx, in, opts...)
@@ -155,7 +150,6 @@ func (m *sentryMultiplexer) HandShake(ctx context.Context, in *emptypb.Empty, op
 	var mu sync.Mutex
 
 	for _, client := range m.clients {
-		client := client
 
 		client.RLock()
 		protocol := client.protocol
@@ -343,7 +337,6 @@ func (m *sentryMultiplexer) SendMessageToRandomPeers(ctx context.Context, in *se
 	}
 
 	for _, peer := range peers {
-		peer := peer
 
 		g.Go(func() error {
 			sentPeers, err := m.clients[peer.clientIndex].SendMessageById(gctx, &sentryproto.SendMessageByIdRequest{
@@ -410,7 +403,6 @@ func (m *sentryMultiplexer) SendMessageToAll(ctx context.Context, in *sentryprot
 	var allSentMutex sync.RWMutex
 
 	for _, peer := range peers {
-		peer := peer
 
 		g.Go(func() error {
 			sentPeers, err := m.clients[peer.clientIndex].SendMessageById(gctx, &sentryproto.SendMessageByIdRequest{
@@ -513,7 +505,6 @@ func (m *sentryMultiplexer) Messages(ctx context.Context, in *sentryproto.Messag
 		defer close(ch)
 
 		for _, client := range m.clients {
-			client := client
 
 			g.Go(func() error {
 				messages, err := client.Messages(gctx, in, opts...)
@@ -560,8 +551,6 @@ func (m *sentryMultiplexer) peersByClient(ctx context.Context, minProtocol sentr
 	var allMutex sync.RWMutex
 
 	for i, client := range m.clients {
-		i := i
-		client := client
 
 		client.RLock()
 		protocol := client.protocol
@@ -619,7 +608,6 @@ func (m *sentryMultiplexer) PeerCount(ctx context.Context, in *sentryproto.PeerC
 	var allMutex sync.RWMutex
 
 	for _, client := range m.clients {
-		client := client
 
 		g.Go(func() error {
 			peerCount, err := client.PeerCount(gctx, in, opts...)
@@ -655,7 +643,6 @@ func (m *sentryMultiplexer) PeerById(ctx context.Context, in *sentryproto.PeerBy
 	var peerMutex sync.RWMutex
 
 	for _, client := range m.clients {
-		client := client
 
 		g.Go(func() error {
 			reply, err := client.PeerById(gctx, in, opts...)
@@ -697,7 +684,6 @@ func (m *sentryMultiplexer) PeerEvents(ctx context.Context, in *sentryproto.Peer
 		defer close(ch)
 
 		for _, client := range m.clients {
-			client := client
 
 			g.Go(func() error {
 				messages, err := client.PeerEvents(gctx, in, opts...)
@@ -744,7 +730,6 @@ func (m *sentryMultiplexer) AddPeer(ctx context.Context, in *sentryproto.AddPeer
 	var successMutex sync.RWMutex
 
 	for _, client := range m.clients {
-		client := client
 
 		g.Go(func() error {
 			result, err := client.AddPeer(gctx, in, opts...)
@@ -781,7 +766,6 @@ func (m *sentryMultiplexer) RemovePeer(ctx context.Context, in *sentryproto.Remo
 	var successMutex sync.RWMutex
 
 	for _, client := range m.clients {
-		client := client
 
 		g.Go(func() error {
 			result, err := client.RemovePeer(gctx, in, opts...)
@@ -822,7 +806,6 @@ func (m *sentryMultiplexer) NodeInfos(ctx context.Context, opts ...grpc.CallOpti
 	var allMutex sync.RWMutex
 
 	for _, client := range m.clients {
-		client := client
 
 		g.Go(func() error {
 			info, err := client.NodeInfo(gctx, &emptypb.Empty{}, opts...)

p2p/sentry/sentry_multi_client/sentry_multi_client_test.go

@@ -226,7 +226,6 @@ func TestMultiClient_AnnounceBlockRangeLoop_SkipInvalidRanges(t *testing.T) {
 	}
 
 	for _, tc := range testcases {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			mockSentry := &mockSentryClient{
 				handShakeFunc: func(ctx context.Context, req *emptypb.Empty, opts ...grpc.CallOption) (*proto_sentry.HandShakeReply, error) {

rpc/client_test.go

@@ -497,7 +497,6 @@ func TestClientHTTP(t *testing.T) {
 	)
 	defer client.Close()
 	for i := range results {
-		i := i
 		go func() {
 			errc <- client.Call(&results[i], "test_echo", wantResult.String, wantResult.Int, wantResult.Args)
 		}()