Skip to content

Commit ee1f135

Browse files
mbrandenburgermbrandenburger
committed
refactor(fabric): remove import of fabric/msp
This commit moves msp imported from fabric into a local package, including tests. Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>
1 parent 6c2dc83 commit ee1f135

File tree

250 files changed

+10482
-50
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+10482
-50
lines changed

‎deps.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ package deps
1010

1111
import (
1212
_ "github.com/IBM/idemix/tools/idemixgen"
13-
_ "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/statecouchdb"
14-
_ "github.com/hyperledger/fabric/core/ledger/pvtdatastorage"
1513
)

‎go.mod‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ require (
8383
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
8484
github.com/Masterminds/semver/v3 v3.4.0 // indirect
8585
github.com/Microsoft/go-winio v0.6.2 // indirect
86-
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
8786
github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
8887
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
8988
github.com/benbjohnson/clock v1.3.5 // indirect
@@ -135,7 +134,6 @@ require (
135134
github.com/gogo/protobuf v1.3.2 // indirect
136135
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
137136
github.com/golang/protobuf v1.5.4 // indirect
138-
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect
139137
github.com/google/go-cmp v0.7.0 // indirect
140138
github.com/google/gopacket v1.1.19 // indirect
141139
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
@@ -257,7 +255,6 @@ require (
257255
github.com/stretchr/objx v0.5.2 // indirect
258256
github.com/subosito/gotenv v1.6.0 // indirect
259257
github.com/sykesm/zap-logfmt v0.0.4 // indirect
260-
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
261258
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
262259
github.com/ugorji/go/codec v1.2.12 // indirect
263260
github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.2 // indirect
@@ -295,7 +292,7 @@ require (
295292
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
296293
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
297294
google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
298-
gopkg.in/yaml.v3 v3.0.1 // indirect
295+
gopkg.in/yaml.v3 v3.0.1
299296
lukechampine.com/blake3 v1.4.1 // indirect
300297
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
301298
modernc.org/libc v1.55.3 // indirect

‎go.sum‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,6 @@ github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lpr
653653
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
654654
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
655655
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
656-
github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
657-
github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI=
658656
github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
659657
github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
660658
github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
@@ -665,8 +663,6 @@ github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjH
665663
github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
666664
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b h1:mimo19zliBX/vSQ6PWWSL9lK8qwHozUj03+zLoEB8O0=
667665
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs=
668-
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
669-
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
670666
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
671667
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
672668
github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
@@ -801,7 +797,6 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
801797
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
802798
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
803799
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
804-
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
805800
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
806801
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
807802
github.com/fsouza/go-dockerclient v1.12.0 h1:S2f2crEUbBNCFiF06kR/GvioEB8EMsb3Td/bpawD+aU=
@@ -928,8 +923,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
928923
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
929924
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
930925
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
931-
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e h1:4bw4WeyTYPp0smaXiJZCNnLrvVBqirQVreixayXezGc=
932-
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
933926
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
934927
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
935928
github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
@@ -1453,7 +1446,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
14531446
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
14541447
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
14551448
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1456-
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
14571449
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
14581450
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
14591451
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
@@ -1465,8 +1457,6 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8
14651457
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
14661458
github.com/sykesm/zap-logfmt v0.0.4 h1:U2WzRvmIWG1wDLCFY3sz8UeEmsdHQjHFNlIdmroVFaI=
14671459
github.com/sykesm/zap-logfmt v0.0.4/go.mod h1:AuBd9xQjAe3URrWT1BBDk2v2onAZHkZkWRMiYZXiZWA=
1468-
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=
1469-
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
14701460
github.com/tedsuo/ifrit v0.0.0-20230330192023-5cba443a66c4/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
14711461
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26 h1:mWCRvpoEMVlslxEvvptKgIUb35va9yj9Oq5wGw/er5I=
14721462
github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26/go.mod h1:0uD3VMXkZ7Bw0ojGCwDzebBBzPBXtzEZeXai+56BLX4=
@@ -1880,7 +1870,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
18801870
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
18811871
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
18821872
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1883-
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
18841873
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
18851874
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
18861875
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=

‎integration/nwo/cmd/cryptogen/msp/msp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common/pkcs11"
1919
"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
2020
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
21-
fabricmsp "github.com/hyperledger/fabric/msp"
21+
fabricmsp "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
2222
"gopkg.in/yaml.v2"
2323
)
2424

‎integration/nwo/cmd/cryptogen/msp/msp_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
ca2 "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/cmd/cryptogen/ca"
1515
msp2 "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/cmd/cryptogen/msp"
1616
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
17-
fabricmsp "github.com/hyperledger/fabric/msp"
17+
fabricmsp "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
1818
"github.com/stretchr/testify/assert"
1919
"gopkg.in/yaml.v2"
2020
)

‎integration/nwo/fabric/identity/identity.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"path/filepath"
1111

1212
"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
13+
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
1314
"github.com/hyperledger/fabric-lib-go/bccsp/sw"
14-
"github.com/hyperledger/fabric/msp"
1515
)
1616

1717
//go:generate counterfeiter -o client/mock/identity.go -fake-name Identity . Identity

‎platform/fabric/core/generic/id/info_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212

1313
idemix2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/msp/idemix"
1414
x5092 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/msp/x509"
15+
fabricmsp "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
1516
sig2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/sig"
1617
mem "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/memory"
1718
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/kvs"
18-
msp2 "github.com/hyperledger/fabric/msp"
1919
"github.com/stretchr/testify/assert"
2020
)
2121

@@ -31,7 +31,7 @@ func TestInfoIdemix(t *testing.T) {
3131
assert.NoError(t, err)
3232
sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), auditInfo, signerInfo)
3333

34-
config, err := msp2.GetLocalMspConfigWithType("./testdata/idemix", nil, "idemix", "idemix")
34+
config, err := fabricmsp.GetLocalMspConfigWithType("./testdata/idemix", nil, "idemix", "idemix")
3535
assert.NoError(t, err)
3636

3737
p, err := idemix2.NewProviderWithEidRhNymPolicy(config, kvss, sigService)

‎platform/fabric/core/generic/membership/channelconfig/api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ package channelconfig
99
import (
1010
"time"
1111

12+
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
1213
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
1314
ab "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
1415
pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
15-
"github.com/hyperledger/fabric/msp"
1616
)
1717

1818
// Org stores the common organizational config

‎platform/fabric/core/generic/membership/channelconfig/capabilities/channel.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
77
package capabilities
88

99
import (
10+
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
1011
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
11-
"github.com/hyperledger/fabric/msp"
1212
)
1313

1414
const (

‎platform/fabric/core/generic/membership/channelconfig/capabilities/channel_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ package capabilities
99
import (
1010
"testing"
1111

12+
"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
1213
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
13-
"github.com/hyperledger/fabric/msp"
1414
"github.com/stretchr/testify/require"
1515
)
1616

0 commit comments

Comments
 (0)