[FAB-8571] removing redundant time.After

- Since request contexts are taking care of
cancelling contexts if deadline exceeds, there
is not need of 'time.After' handling in those cases.


Change-Id: Ic777d23a7904f90c2e211e9dfe5f4f5a086a17bd
Signed-off-by: Sudesh Shetty <sudesh.shetty@securekey.com>

Author: sudeshrshetty

pkg/client/channel/chclient.go

@@ -20,7 +20,6 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors/multi"
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors/retry"
-	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	"github.com/hyperledger/fabric-sdk-go/pkg/logging"
 	"github.com/pkg/errors"
 )
@@ -147,9 +146,6 @@ func (cc *Client) InvokeHandler(handler invoke.Handler, request Request, options
 	select {
 	case <-complete:
 		return Response(requestContext.Response), requestContext.Error
-	case <-time.After(requestContext.Opts.Timeouts[core.Execute]):
-		return Response{}, status.New(status.ClientStatus, status.Timeout.ToInt32(),
-			"request timed out", nil)
 	}
 }
 

pkg/client/channel/invoke/txnhandler.go

@@ -8,12 +8,10 @@ package invoke
 
 import (
 	"bytes"
-	"time"
 
 	"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
 	"github.com/pkg/errors"
 
-	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
 	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fab/peer"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fab/txn"
@@ -164,9 +162,6 @@ func (c *CommitTxHandler) Handle(requestContext *RequestContext, clientContext *
 			requestContext.Error = status.New(status.EventServerStatus, int32(txStatus.TxValidationCode), "received invalid transaction", nil)
 			return
 		}
-	case <-time.After(requestContext.Opts.Timeouts[core.Execute]):
-		requestContext.Error = errors.New("Execute didn't receive block event")
-		return
 	}
 
 	//Delegate to next step if any

pkg/client/resmgmt/resmgmt.go

@@ -603,8 +603,6 @@ func (rc *Client) sendCCProposal(reqCtx reqContext.Context, ccProposalType chain
 			return nil
 		}
 		return status.New(status.EventServerStatus, int32(txStatus.TxValidationCode), "instantiateOrUpgradeCC failed", nil)
-	case <-time.After(timeout):
-		return errors.New("instantiateOrUpgradeCC timeout")
 	}
 
 }