[FAB-5183] Fabric-ca client refactoring

-Improve test coverage
-Rename method GetCAName to CAName

Change-Id: I7e67b56784f2cc5bf58c3411e245480d8b1a6d67
Signed-off-by: Firas Qutishat <firas.qutishat@securekey.com>

Author: Firas Qutishat

Makefile

@@ -53,6 +53,7 @@ mock-gen:
 	go get -u github.com/golang/mock/mockgen
 	mockgen -build_flags '$(LDFLAGS)' github.com/hyperledger/fabric-sdk-go/api/apitxn ProposalProcessor | sed "s/github.com\/hyperledger\/fabric-sdk-go\/vendor\///g"  > api/apitxn/mocks/mockapitxn.gen.go
 	mockgen -build_flags '$(LDFLAGS)' github.com/hyperledger/fabric-sdk-go/api/apiconfig Config | sed "s/github.com\/hyperledger\/fabric-sdk-go\/vendor\///g"  > api/apiconfig/mocks/mockconfig.gen.go
+	mockgen -build_flags '$(LDFLAGS)' github.com/hyperledger/fabric-sdk-go/api/apifabca FabricCAClient | sed "s/github.com\/hyperledger\/fabric-sdk-go\/vendor\///g"  > api/apifabca/mocks/mockfabriccaclient.gen.go
 
 clean:
 	rm -Rf /tmp/enroll_user /tmp/msp /tmp/keyvaluestore

api/apifabca/fabricca.go

@@ -12,7 +12,7 @@ import (
 
 // FabricCAClient is the client interface for fabric-ca
 type FabricCAClient interface {
-	GetCAName() string
+	CAName() string
 	Enroll(enrollmentID string, enrollmentSecret string) (bccsp.Key, []byte, error)
 	// Reenroll to renew user's enrollment certificate
 	Reenroll(user User) (bccsp.Key, []byte, error)

api/apifabca/mocks/mockfabriccaclient.gen.go

@@ -82,7 +82,7 @@ func NewFabricCAClient(config config.Config, org string) (sdkApi.FabricCAClient,
 	return fabricCAClient, nil
 }
 
-func (fabricCAServices *fabricCA) GetCAName() string {
+func (fabricCAServices *fabricCA) CAName() string {
 	return fabricCAServices.fabricCAClient.Config.CAName
 }
 
@@ -137,11 +137,6 @@ func (fabricCAServices *fabricCA) Reenroll(user sdkApi.User) (bccsp.Key, []byte,
 		return nil, nil, fmt.Errorf("Reenroll has failed; Cannot create user identity: %s", err)
 	}
 
-	if identity.GetECert() == nil {
-		logger.Infof("Invalid re-enroll request for user '%s'. Enrollment cert does not exist %s\n", user.Name(), err)
-		return nil, nil, fmt.Errorf("Reenroll has failed; enrollment cert does not exist: %s", err)
-	}
-
 	reenrollmentResponse, err := identity.Reenroll(req)
 	if err != nil {
 		return nil, nil, fmt.Errorf("ReEnroll failed: %s", err)