From 98dfc86c8586fa986be99c3fcdcd83f65301f3c6 Mon Sep 17 00:00:00 2001 From: jkneubuh <86427252+jkneubuh@users.noreply.github.com> Date: Thu, 7 Jul 2022 13:02:57 -0400 Subject: [PATCH] Revert "fixup! Idemix MSP Folder Structure incompatible with what Fabric expects #303" This reverts commit 29e083ecab02634beea6e9500ea4d86be3fa21a5. Signed-off-by: Josh Kneubuhl --- lib/client.go | 14 +------------- lib/client/credential/idemix/credential.go | 2 -- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/client.go b/lib/client.go index d4e744dd9..e0bcc6472 100644 --- a/lib/client.go +++ b/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) diff --git a/lib/client/credential/idemix/credential.go b/lib/client/credential/idemix/credential.go index 851272685..db8fded83 100644 --- a/lib/client/credential/idemix/credential.go +++ b/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,