From c362c85ce8a472cad60f77c3885ab6176100aa86 Mon Sep 17 00:00:00 2001
From: yacovm <yacovm@il.ibm.com>
Date: Fri, 21 Sep 2018 23:05:08 +0300
Subject: [PATCH] [FAB-12082] Appease go vet with cancelations in gossip

This change set adds cancelations of the stream cancel function
on all exit paths to appease go vet.

FAB-12082 #done

Change-Id: Ib94d5baaa28ae65b96fbff8e1837b770ed7c6531
Signed-off-by: yacovm <yacovm@il.ibm.com>
---
 gossip/comm/comm_impl.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/gossip/comm/comm_impl.go b/gossip/comm/comm_impl.go
index fd8a118cf69..f49dfe0ad1a 100644
--- a/gossip/comm/comm_impl.go
+++ b/gossip/comm/comm_impl.go
@@ -164,7 +164,8 @@ func (c *commImpl) createConnection(endpoint string, expectedPKIID common.PKIidT
 	dialOpts = append(dialOpts, grpc.WithBlock())
 	dialOpts = append(dialOpts, c.opts...)
 	ctx := context.Background()
-	ctx, _ = context.WithTimeout(ctx, c.dialTimeout)
+	ctx, cancel := context.WithTimeout(ctx, c.dialTimeout)
+	defer cancel()
 	cc, err = grpc.DialContext(ctx, endpoint, dialOpts...)
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -172,14 +173,14 @@ func (c *commImpl) createConnection(endpoint string, expectedPKIID common.PKIidT
 
 	cl := proto.NewGossipClient(cc)
 
-	ctx, cancel := context.WithTimeout(context.Background(), defConnTimeout)
+	ctx, cancel = context.WithTimeout(context.Background(), defConnTimeout)
 	defer cancel()
 	if _, err = cl.Ping(ctx, &proto.Empty{}); err != nil {
 		cc.Close()
 		return nil, errors.WithStack(err)
 	}
 
-	ctx, cf := context.WithCancel(context.Background())
+	ctx, cancel = context.WithCancel(context.Background())
 	if stream, err = cl.GossipStream(ctx); err == nil {
 		connInfo, err = c.authenticateRemotePeer(stream, true)
 		if err == nil {
@@ -194,6 +195,7 @@ func (c *commImpl) createConnection(endpoint string, expectedPKIID common.PKIidT
 				if !bytes.Equal(actualOrg, oldOrg) {
 					c.logger.Warning("Remote endpoint claims to be a different peer, expected", expectedPKIID, "but got", pkiID)
 					cc.Close()
+					cancel()
 					return nil, errors.New("authentication failure")
 				}
 			}
@@ -201,7 +203,7 @@ func (c *commImpl) createConnection(endpoint string, expectedPKIID common.PKIidT
 			conn.pkiID = pkiID
 			conn.info = connInfo
 			conn.logger = c.logger
-			conn.cancel = cf
+			conn.cancel = cancel
 
 			h := func(m *proto.SignedGossipMessage) {
 				c.logger.Debug("Got message:", m)
@@ -218,6 +220,7 @@ func (c *commImpl) createConnection(endpoint string, expectedPKIID common.PKIidT
 		c.logger.Warningf("Authentication failed: %+v", err)
 	}
 	cc.Close()
+	cancel()
 	return nil, errors.WithStack(err)
 }
 
@@ -271,7 +274,8 @@ func (c *commImpl) Probe(remotePeer *RemotePeer) error {
 	dialOpts = append(dialOpts, grpc.WithBlock())
 	dialOpts = append(dialOpts, c.opts...)
 	ctx := context.Background()
-	ctx, _ = context.WithTimeout(ctx, c.dialTimeout)
+	ctx, cancel := context.WithTimeout(ctx, c.dialTimeout)
+	defer cancel()
 	cc, err := grpc.DialContext(ctx, remotePeer.Endpoint, dialOpts...)
 	if err != nil {
 		c.logger.Debugf("Returning %v", err)
@@ -279,7 +283,7 @@ func (c *commImpl) Probe(remotePeer *RemotePeer) error {
 	}
 	defer cc.Close()
 	cl := proto.NewGossipClient(cc)
-	ctx, cancel := context.WithTimeout(context.Background(), defConnTimeout)
+	ctx, cancel = context.WithTimeout(context.Background(), defConnTimeout)
 	defer cancel()
 	_, err = cl.Ping(ctx, &proto.Empty{})
 	c.logger.Debugf("Returning %v", err)
@@ -292,7 +296,8 @@ func (c *commImpl) Handshake(remotePeer *RemotePeer) (api.PeerIdentityType, erro
 	dialOpts = append(dialOpts, grpc.WithBlock())
 	dialOpts = append(dialOpts, c.opts...)
 	ctx := context.Background()
-	ctx, _ = context.WithTimeout(ctx, c.dialTimeout)
+	ctx, cancel := context.WithTimeout(ctx, c.dialTimeout)
+	defer cancel()
 	cc, err := grpc.DialContext(ctx, remotePeer.Endpoint, dialOpts...)
 	if err != nil {
 		return nil, err
@@ -300,7 +305,7 @@ func (c *commImpl) Handshake(remotePeer *RemotePeer) (api.PeerIdentityType, erro
 	defer cc.Close()
 
 	cl := proto.NewGossipClient(cc)
-	ctx, cancel := context.WithTimeout(context.Background(), defConnTimeout)
+	ctx, cancel = context.WithTimeout(context.Background(), defConnTimeout)
 	defer cancel()
 	if _, err = cl.Ping(ctx, &proto.Empty{}); err != nil {
 		return nil, err