[FABG-927] Patch upstream

Signed-off-by: Aleksandar Likic <aleksandar.likic@securekey.com>
hyperledger · Dec 14, 2019 · 17677af · 17677af
1 parent 73d44b6
commit 17677af
Show file tree

Hide file tree

Showing 114 changed files with 1,046 additions and 4,909 deletions.
diff --git a/internal/github.com/hyperledger/fabric-ca/api/client.go b/internal/github.com/hyperledger/fabric-ca/api/client.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/cloudflare/cfssl/csr"
-	"github.com/hyperledger/fabric-ca/util"
+	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/util"
 )
 
 // RegistrationRequest for a new identity

diff --git a/internal/github.com/hyperledger/fabric-ca/api/net.go b/internal/github.com/hyperledger/fabric-ca/api/net.go
@@ -22,7 +22,6 @@ package api
 
 import (
 	"github.com/cloudflare/cfssl/signer"
-	"github.com/hyperledger/fabric/idemix"
 )
 
 /*
@@ -48,12 +47,6 @@ type EnrollmentRequestNet struct {
 	AttrReqs []*AttributeRequest `json:"attr_reqs,omitempty"`
 }
 
-// IdemixEnrollmentRequestNet is a request to enroll an identity and get idemix credential
-type IdemixEnrollmentRequestNet struct {
-	*idemix.CredRequest `json:"request"`
-	CAName              string `json:"caname"`
-}
-
 // ReenrollmentRequestNet is a request to reenroll an identity.
 // This is useful to renew a certificate before it has expired.
 type ReenrollmentRequestNet struct {