[FAB-8571] timeout error message refactoring

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

Author: sudeshrshetty

pkg/client/channel/chclient.go

@@ -122,7 +122,7 @@ func (cc *Client) InvokeHandler(handler invoke.Handler, request Request, options
 		return Response(requestContext.Response), requestContext.Error
 	case <-reqCtx.Done():
 		return Response{}, status.New(status.ClientStatus, status.Timeout.ToInt32(),
-			"request timed out", nil)
+			"request timed out or been cancelled", nil)
 	}
 }
 

pkg/client/resmgmt/resmgmt.go

@@ -604,7 +604,7 @@ func (rc *Client) sendCCProposal(reqCtx reqContext.Context, ccProposalType chain
 		}
 		return status.New(status.EventServerStatus, int32(txStatus.TxValidationCode), "instantiateOrUpgradeCC failed", nil)
 	case <-reqCtx.Done():
-		return errors.New("instantiateOrUpgradeCC timeout")
+		return errors.New("instantiateOrUpgradeCC timed out or been cancelled")
 	}
 
 }