From 59a0de2b33f10dbf5fc5d5621ed5793144ce3323 Mon Sep 17 00:00:00 2001 From: Angelo De Caro Date: Wed, 20 Nov 2024 09:48:24 +0100 Subject: [PATCH] rebase fix Signed-off-by: Angelo De Caro --- go.mod | 7 ------- go.sum | 2 -- token/services/identity/msp/idemix/km_test.go | 5 +---- token/services/identity/msp/idemix/kmp.go | 3 ++- token/services/identity/msp/idemix/lm.go | 0 5 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 token/services/identity/msp/idemix/lm.go diff --git a/go.mod b/go.mod index 49b807a1f..bc203ac5a 100644 --- a/go.mod +++ b/go.mod @@ -48,8 +48,6 @@ require ( github.com/alecthomas/kingpin/v2 v2.4.0 // indirect github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect github.com/hyperledger/aries-bbs-go v0.0.0-20240528084656-761671ea73bc // indirect - github.com/pelletier/go-toml v1.9.5 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/xhit/go-str2duration/v2 v2.1.0 // indirect ) @@ -67,10 +65,6 @@ require ( github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20240820063231-23c21a416ee1 // indirect github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/Microsoft/hcsshim v0.11.5 // indirect - github.com/ale-linux/aries-framework-go/component/kmscrypto v0.0.0-20231023164747-f3f972769504 // indirect - github.com/alecthomas/kingpin/v2 v2.4.0 // indirect - github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.13.0 // indirect @@ -265,7 +259,6 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - github.com/xhit/go-str2duration/v2 v2.1.0 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect diff --git a/go.sum b/go.sum index 366c6cf6d..c19c0c4c1 100644 --- a/go.sum +++ b/go.sum @@ -1068,8 +1068,6 @@ github.com/hidal-go/hidalgo v0.0.0-20201109092204-05749a6d73df/go.mod h1:bPkrxDl github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= -github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241111074600-334cc6d09cd6 h1:muVqNcNGwDkPs6L5d/KZOSy5Y/YIwWRHCi4Ox3AbSC4= -github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241111074600-334cc6d09cd6/go.mod h1:vZLAiVznnEdHyx1OV5nIqf34apnfdhonwJL+qEYniIQ= github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241114072958-8bdbea854812 h1:1GGnfSHFRKfnCZtho6Ia8ZneaGsI5abKDqXsdL8hVSo= github.com/hyperledger-labs/fabric-smart-client v0.3.1-0.20241114072958-8bdbea854812/go.mod h1:vZLAiVznnEdHyx1OV5nIqf34apnfdhonwJL+qEYniIQ= github.com/hyperledger-labs/orion-sdk-go v0.2.10 h1:lFgWgxyvngIhWnIqymYGBmtmq9D6uC5d0uLG9cbyh5s= diff --git a/token/services/identity/msp/idemix/km_test.go b/token/services/identity/msp/idemix/km_test.go index 678a3d86c..e0667ad9d 100644 --- a/token/services/identity/msp/idemix/km_test.go +++ b/token/services/identity/msp/idemix/km_test.go @@ -11,10 +11,6 @@ import ( "strings" "testing" - mem "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/db/driver/memory" - "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/msp/idemix/msp" - "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/msp/idemix/schema" - idemix2 "github.com/IBM/idemix" "github.com/IBM/idemix/bccsp/types" bccsp "github.com/IBM/idemix/bccsp/types" @@ -28,6 +24,7 @@ import ( kvs2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/kvs" "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/msp/idemix" "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/msp/idemix/msp" + "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/msp/idemix/schema" "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/sig" msp2 "github.com/hyperledger/fabric/msp" "github.com/stretchr/testify/assert" diff --git a/token/services/identity/msp/idemix/kmp.go b/token/services/identity/msp/idemix/kmp.go index 22e1ef1f8..a2986a7a1 100644 --- a/token/services/identity/msp/idemix/kmp.go +++ b/token/services/identity/msp/idemix/kmp.go @@ -15,6 +15,7 @@ import ( driver2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/driver" "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/msp/idemix/cache" msp2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/msp/idemix/msp" + "github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/msp/idemix/schema" "github.com/hyperledger-labs/fabric-token-sdk/token/services/logging" "github.com/hyperledger/fabric-protos-go/msp" "github.com/pkg/errors" @@ -60,7 +61,7 @@ func (l *KeyManagerProvider) Get(identityConfig *driver.IdentityConfiguration) ( if err != nil { return nil, errors.WithMessage(err, "failed to instantiate crypto provider") } - provider, err := NewKeyManager(conf, l.signerService, bccsp.EidNymRhNym, cryptoProvider) + provider, err := NewKeyManager(conf, l.signerService, bccsp.EidNymRhNym, cryptoProvider, &schema.DefaultManager{}, "") if err != nil { return nil, errors.Wrapf(err, "failed instantiating idemix msp provider from [%s]", identityConfig.URL) } diff --git a/token/services/identity/msp/idemix/lm.go b/token/services/identity/msp/idemix/lm.go deleted file mode 100644 index e69de29bb..000000000