[FAB-8571] timeout refactoring in chclient,txnhandler

Putting back timeout logic removed from txnHandler,
but using 'context.done' instead.

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

pkg/client/channel/chclient.go

@@ -20,6 +20,7 @@ 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"
 )
@@ -146,6 +147,9 @@ func (cc *Client) InvokeHandler(handler invoke.Handler, request Request, options
 	select {
 	case <-complete:
 		return Response(requestContext.Response), requestContext.Error
+	case <-reqCtx.Done():
+		return Response{}, status.New(status.ClientStatus, status.Timeout.ToInt32(),
+			"request timed out", nil)
 	}
 }
 
@@ -216,6 +220,7 @@ func (cc *Client) prepareHandlerContexts(reqCtx reqContext.Context, request Requ
 		Opts:         invoke.Opts(o),
 		Response:     invoke.Response{},
 		RetryHandler: retry.New(o.Retry),
+		Ctx:          reqCtx,
 	}
 
 	return requestContext, clientContext, nil

pkg/client/channel/invoke/api.go

@@ -64,4 +64,5 @@ type RequestContext struct {
 	Response     Response
 	Error        error
 	RetryHandler retry.Handler
+	Ctx          reqContext.Context
 }

pkg/client/channel/invoke/txnhandler.go

@@ -162,6 +162,9 @@ func (c *CommitTxHandler) Handle(requestContext *RequestContext, clientContext *
 			requestContext.Error = status.New(status.EventServerStatus, int32(txStatus.TxValidationCode), "received invalid transaction", nil)
 			return
 		}
+	case <-requestContext.Ctx.Done():
+		requestContext.Error = errors.New("Execute didn't receive block event")
+		return
 	}
 
 	//Delegate to next step if any

pkg/client/channel/invoke/txnhandler_test.go

@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package invoke
 
 import (
+	reqContext "context"
 	"strings"
 	"testing"
 	"time"
@@ -212,6 +213,7 @@ func prepareRequestContext(request Request, opts Opts, t *testing.T) *RequestCon
 	requestContext := &RequestContext{Request: request,
 		Opts:     opts,
 		Response: Response{},
+		Ctx:      reqContext.Background(),
 	}
 
 	requestContext.Opts.Timeouts = make(map[core.TimeoutType]time.Duration)

pkg/client/resmgmt/resmgmt.go

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