add github.com/hyperledger/fabric-protos-go-apiv2

Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>

bccsp/aries_test.go

@@ -17,7 +17,7 @@ import (
 	bccsp "github.com/IBM/idemix/bccsp/types"
 	math "github.com/IBM/mathlib"
 	"github.com/golang/protobuf/proto"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

bccsp/bccsp_test.go

@@ -10,7 +10,7 @@ import (
 	"io/ioutil"
 
 	math "github.com/IBM/mathlib"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
 
@@ -88,7 +88,7 @@ var _ = Describe("Idemix Bridge Compatibility", func() {
 			AttributeNames  []string
 
 			UserKey bccsp.Key
-			//NymKey       bccsp.Key
+			// NymKey       bccsp.Key
 			NymPublicKey bccsp.Key
 
 			IssuerNonce []byte
@@ -125,35 +125,35 @@ var _ = Describe("Idemix Bridge Compatibility", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			// User Nym Key
-			//rawNymKeySk, err := ioutil.ReadFile("./testdata/old/nymkey.sk")
-			//Expect(err).NotTo(HaveOccurred())
+			// rawNymKeySk, err := ioutil.ReadFile("./testdata/old/nymkey.sk")
+			// Expect(err).NotTo(HaveOccurred())
 			rawNymKeyPk, err := ioutil.ReadFile("./testdata/old/nymkey.pk")
 			Expect(err).NotTo(HaveOccurred())
 
-			//NymKey, err = CSP.KeyImport(append(rawNymKeySk, rawNymKeyPk...), &bccsp.IdemixNymKeyImportOpts{Temporary: true})
-			//Expect(err).NotTo(HaveOccurred())
+			// NymKey, err = CSP.KeyImport(append(rawNymKeySk, rawNymKeyPk...), &bccsp.IdemixNymKeyImportOpts{Temporary: true})
+			// Expect(err).NotTo(HaveOccurred())
 			NymPublicKey, err = CSP.KeyImport(rawNymKeyPk, &bccsp.IdemixNymPublicKeyImportOpts{Temporary: true})
 			Expect(err).NotTo(HaveOccurred())
 
-			//IssuerNonce = make([]byte, 32)
-			//n, err := rand.Read(IssuerNonce)
-			//Expect(n).To(BeEquivalentTo(32))
-			//Expect(err).NotTo(HaveOccurred())
+			// IssuerNonce = make([]byte, 32)
+			// n, err := rand.Read(IssuerNonce)
+			// Expect(n).To(BeEquivalentTo(32))
+			// Expect(err).NotTo(HaveOccurred())
 			IssuerNonce, err = ioutil.ReadFile("./testdata/old/issuer_nonce")
 			Expect(err).NotTo(HaveOccurred())
 
 			// Credential Request for User
 			credRequest, err = ioutil.ReadFile("./testdata/old/cred_request.sign")
 			Expect(err).NotTo(HaveOccurred())
-			//credRequest, err = CSP.Sign(
+			// credRequest, err = CSP.Sign(
 			//	UserKey,
 			//	nil,
 			//	&bccsp.IdemixCredentialRequestSignerOpts{IssuerPK: IssuerPublicKey, IssuerNonce: IssuerNonce},
-			//)
-			//Expect(err).NotTo(HaveOccurred())
+			// )
+			// Expect(err).NotTo(HaveOccurred())
 
 			// Credential
-			//credential, err = CSP.Sign(
+			// credential, err = CSP.Sign(
 			//	IssuerKey,
 			//	credRequest,
 			//	&bccsp.IdemixCredentialSignerOpts{
@@ -165,8 +165,8 @@ var _ = Describe("Idemix Bridge Compatibility", func() {
 			//			{Type: bccsp.IdemixBytesAttribute, Value: []byte{0, 1, 2, 3}},
 			//		},
 			//	},
-			//)
-			//Expect(err).NotTo(HaveOccurred())
+			// )
+			// Expect(err).NotTo(HaveOccurred())
 			credential, err = ioutil.ReadFile("./testdata/old/credential.sign")
 			Expect(err).NotTo(HaveOccurred())
 
@@ -179,12 +179,12 @@ var _ = Describe("Idemix Bridge Compatibility", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			// CRI
-			//cri, err = CSP.Sign(
+			// cri, err = CSP.Sign(
 			//	RevocationKey,
 			//	nil,
 			//	&bccsp.IdemixCRISignerOpts{},
-			//)
-			//Expect(err).NotTo(HaveOccurred())
+			// )
+			// Expect(err).NotTo(HaveOccurred())
 			cri, err = ioutil.ReadFile("./testdata/old/cri.sign")
 			Expect(err).NotTo(HaveOccurred())
 		})
@@ -241,7 +241,7 @@ var _ = Describe("Idemix Bridge Compatibility", func() {
 
 				digest = []byte("a digest")
 
-				//signature, err = CSP.Sign(
+				// signature, err = CSP.Sign(
 				//	UserKey,
 				//	digest,
 				//	&bccsp.IdemixSignerOpts{
@@ -259,8 +259,8 @@ var _ = Describe("Idemix Bridge Compatibility", func() {
 				//		Epoch:   0,
 				//		CRI:     cri,
 				//	},
-				//)
-				//Expect(err).NotTo(HaveOccurred())
+				// )
+				// Expect(err).NotTo(HaveOccurred())
 				signature, err = ioutil.ReadFile("./testdata/old/signature_no_disclosed_attribute.sign")
 				Expect(err).NotTo(HaveOccurred())
 			})
@@ -301,7 +301,7 @@ var _ = Describe("Idemix Bridge Compatibility", func() {
 
 				digest = []byte("a digest")
 
-				//signature, err = CSP.Sign(
+				// signature, err = CSP.Sign(
 				//	UserKey,
 				//	digest,
 				//	&bccsp.IdemixSignerOpts{
@@ -319,8 +319,8 @@ var _ = Describe("Idemix Bridge Compatibility", func() {
 				//		Epoch:   0,
 				//		CRI:     cri,
 				//	},
-				//)
-				//Expect(err).NotTo(HaveOccurred())
+				// )
+				// Expect(err).NotTo(HaveOccurred())
 				signature, err = ioutil.ReadFile("./testdata/old/signature_with_disclosed_attribute.sign")
 				Expect(err).NotTo(HaveOccurred())
 			})
@@ -361,15 +361,15 @@ var _ = Describe("Idemix Bridge Compatibility", func() {
 
 				digest = []byte("a digest")
 
-				//signature, err = CSP.Sign(
+				// signature, err = CSP.Sign(
 				//	UserKey,
 				//	digest,
 				//	&bccsp.IdemixNymSignerOpts{
 				//		Nym:      NymKey,
 				//		IssuerPK: IssuerPublicKey,
 				//	},
-				//)
-				//Expect(err).NotTo(HaveOccurred())
+				// )
+				// Expect(err).NotTo(HaveOccurred())
 				signature, err = ioutil.ReadFile("./testdata/old/nym_signature.sign")
 				Expect(err).NotTo(HaveOccurred())
 			})

bccsp/handlers/cred_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/IBM/idemix/bccsp/handlers"
 	bccsp "github.com/IBM/idemix/bccsp/types"
 	"github.com/IBM/idemix/bccsp/types/mock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
 )

bccsp/handlers/idemix_suite_test.go

@@ -8,7 +8,7 @@ package handlers_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

bccsp/handlers/issuer_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/IBM/idemix/bccsp/handlers"
 	bccsp "github.com/IBM/idemix/bccsp/types"
 	"github.com/IBM/idemix/bccsp/types/mock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
 )

bccsp/handlers/nymsigner_test.go

@@ -13,7 +13,7 @@ import (
 	bccsp "github.com/IBM/idemix/bccsp/types"
 	"github.com/IBM/idemix/bccsp/types/mock"
 	math "github.com/IBM/mathlib"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

bccsp/handlers/revocation_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/IBM/idemix/bccsp/handlers"
 	bccsp "github.com/IBM/idemix/bccsp/types"
 	"github.com/IBM/idemix/bccsp/types/mock"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
 )

bccsp/handlers/signer_test.go

@@ -13,7 +13,7 @@ import (
 	bccsp "github.com/IBM/idemix/bccsp/types"
 	"github.com/IBM/idemix/bccsp/types/mock"
 	math "github.com/IBM/mathlib"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

bccsp/handlers/user_test.go

@@ -13,7 +13,7 @@ import (
 	bccsp "github.com/IBM/idemix/bccsp/types"
 	"github.com/IBM/idemix/bccsp/types/mock"
 	math "github.com/IBM/mathlib"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
 )

bccsp/idemix_suite_test.go

@@ -8,7 +8,7 @@ package idemix_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

bccsp/legacy_test.go

@@ -17,7 +17,7 @@ import (
 	bccsp "github.com/IBM/idemix/bccsp/types"
 	math "github.com/IBM/mathlib"
 	"github.com/golang/protobuf/proto"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

bccsp/schemes/dlog/bridge/bridge_suite_test.go

@@ -9,7 +9,7 @@ import (
 	"io"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

bccsp/schemes/dlog/bridge/bridge_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/IBM/idemix/bccsp/types/mock"
 	math "github.com/IBM/mathlib"
 	"github.com/golang/protobuf/proto"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

go.mod

@@ -10,9 +10,9 @@ require (
 	github.com/alecthomas/kingpin/v2 v2.4.0
 	github.com/golang/protobuf v1.5.4
 	github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc
-	github.com/hyperledger/fabric-protos-go v0.3.3
-	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.34.1
+	github.com/hyperledger/fabric-protos-go-apiv2 v0.3.3
+	github.com/onsi/ginkgo/v2 v2.13.2
+	github.com/onsi/gomega v1.31.0
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.9.0
 	github.com/sykesm/zap-logfmt v0.0.4
@@ -26,22 +26,22 @@ require (
 	github.com/consensys/bavard v0.1.13 // indirect
 	github.com/consensys/gnark-crypto v0.13.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect
 	github.com/kilic/bls12-381 v0.1.0 // indirect
 	github.com/mmcloughlin/addchain v0.4.0 // indirect
-	github.com/nxadm/tail v1.4.11 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
 	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )