Revert "fixup! Idemix MSP Folder Structure incompatible with what Fab…

…ric expects #303"

This reverts commit 29e083e.

lib/client.go

@@ -12,7 +12,6 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/hyperledger/fabric-protos-go/msp"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -945,18 +944,7 @@ func (c *Client) verifyIdemixCredential() error {
 	signerConfig := &idemixcred.SignerConfig{}
 	err = json.Unmarshal(credfileBytes, signerConfig)
 	if err != nil {
-		// try proto
-		idemixSignerConfig := &msp.IdemixMSPSignerConfig{}
-		err = proto.Unmarshal(credfileBytes, idemixSignerConfig)
-		if err != nil {
-			return errors.Wrapf(err, "Failed to unmarshal signer config from %s", c.idemixCredFile)
-		}
-		signerConfig.Cred = idemixSignerConfig.Cred
-		signerConfig.Sk = idemixSignerConfig.Sk
-		signerConfig.CredentialRevocationInformation = idemixSignerConfig.CredentialRevocationInformation
-		signerConfig.EnrollmentID = idemixSignerConfig.EnrollmentId
-		signerConfig.Role = int(idemixSignerConfig.Role)
-		signerConfig.OrganizationalUnitIdentifier = idemixSignerConfig.OrganizationalUnitIdentifier
+		return errors.Wrapf(err, "Failed to unmarshal signer config from %s", c.idemixCredFile)
 	}
 
 	cred := new(idemix.Credential)

lib/client/credential/idemix/credential.go

@@ -90,8 +90,6 @@ func (cred *Credential) Store() error {
 		return err
 	}
 	caSignerConfig := val.(*SignerConfig)
-
-	// Store the MSP signer config as Fabric expects
 	mspSignerConfig := &m.IdemixMSPSignerConfig{
 		Cred:                            caSignerConfig.Cred,
 		Sk:                              caSignerConfig.Sk,