Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 79f2f4e

Browse files
author
Aleksandar Likic
committed
[FAB-8940] Refactor pkg.common.msp.Providers interface
Now it follows the same pattern as other providers' interfaces. Change-Id: I75edec2abf407eaf65ddc9d8e7f49b57bca64e64 Signed-off-by: Aleksandar Likic <aleksandar.likic@securekey.com>
1 parent cc16a4a commit 79f2f4e

File tree

10 files changed

+31
-33
lines changed

10 files changed

+31
-33
lines changed

pkg/common/providers/msp/provider.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ type Context interface {
1414
Providers
1515
}
1616

17-
// TODO - the Providers/Provider interfaces need to be refactored to be similar to other Providers
18-
19-
// Provider provides MSP services
20-
type Provider interface {
21-
UserStore() UserStore
17+
// IdentityManagerProvider provides identity management services
18+
type IdentityManagerProvider interface {
2219
IdentityManager(orgName string) (IdentityManager, bool)
2320
}
2421

25-
// Providers represents the MSP service providers context.
22+
// Providers represents a provider of MSP service.
2623
type Providers interface {
27-
Provider
24+
UserStore() UserStore
25+
IdentityManagerProvider
2826
}

pkg/context/context.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ func (c *Channel) ChannelID() string {
5959
return c.channelID
6060
}
6161

62-
//Provider implementation for Providers interface
62+
//Provider implementation of Providers interface
6363
type Provider struct {
6464
config core.Config
6565
userStore msp.UserStore
6666
cryptoSuite core.CryptoSuite
6767
discoveryProvider fab.DiscoveryProvider
6868
selectionProvider fab.SelectionProvider
6969
signingManager core.SigningManager
70-
mspProvider msp.Provider
70+
idMgmtProvider msp.IdentityManagerProvider
7171
infraProvider fab.InfraProvider
7272
channelProvider fab.ChannelProvider
7373
}
@@ -84,7 +84,7 @@ func (c *Provider) CryptoSuite() core.CryptoSuite {
8484

8585
// IdentityManager returns identity manager for organization
8686
func (c *Provider) IdentityManager(orgName string) (msp.IdentityManager, bool) {
87-
return c.mspProvider.IdentityManager(orgName)
87+
return c.idMgmtProvider.IdentityManager(orgName)
8888
}
8989

9090
// SigningManager returns signing manager
@@ -162,10 +162,10 @@ func WithSigningManager(signingManager core.SigningManager) SDKContextParams {
162162
}
163163
}
164164

165-
//WithMSPProvider sets MSPProvider maps to context
166-
func WithMSPProvider(provider msp.Provider) SDKContextParams {
165+
//WithIdentityManagerProvider sets IdentityManagerProvider maps to context
166+
func WithIdentityManagerProvider(provider msp.IdentityManagerProvider) SDKContextParams {
167167
return func(ctx *Provider) {
168-
ctx.mspProvider = provider
168+
ctx.idMgmtProvider = provider
169169
}
170170
}
171171

pkg/fabsdk/api/factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type CoreProviderFactory interface {
2929
// MSPProviderFactory allows overriding providers of MSP services
3030
type MSPProviderFactory interface {
3131
CreateUserStore(config core.Config) (msp.UserStore, error)
32-
CreateProvider(config core.Config, cryptoProvider core.CryptoSuite, userStore msp.UserStore) (msp.Provider, error)
32+
CreateIdentityManagerProvider(config core.Config, cryptoProvider core.CryptoSuite, userStore msp.UserStore) (msp.IdentityManagerProvider, error)
3333
}
3434

3535
// ServiceProviderFactory allows overriding default service providers (such as peer discovery)

pkg/fabsdk/fabsdk.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@ func initSDK(sdk *FabricSDK, config core.Config, opts []Option) error {
175175
return errors.WithMessage(err, "failed to initialize signing manager")
176176
}
177177

178-
// Initialize MSP Provider
179-
mspProvider, err := sdk.opts.MSP.CreateProvider(config, cryptoSuite, userStore)
178+
// Initialize IdentityManagerProvider
179+
identityManagerProvider, err := sdk.opts.MSP.CreateIdentityManagerProvider(config, cryptoSuite, userStore)
180180
if err != nil {
181181
return errors.WithMessage(err, "failed to initialize identity manager provider")
182182
}
183183

184-
// Initialize Fabric Provider
184+
// Initialize Fabric provider
185185
infraProvider, err := sdk.opts.Core.CreateInfraProvider(config)
186186
if err != nil {
187187
return errors.WithMessage(err, "failed to initialize infra provider")
@@ -211,7 +211,7 @@ func initSDK(sdk *FabricSDK, config core.Config, opts []Option) error {
211211
context.WithUserStore(userStore),
212212
context.WithDiscoveryProvider(discoveryProvider),
213213
context.WithSelectionProvider(selectionProvider),
214-
context.WithMSPProvider(mspProvider),
214+
context.WithIdentityManagerProvider(identityManagerProvider),
215215
context.WithInfraProvider(infraProvider),
216216
context.WithChannelProvider(channelProvider))
217217

pkg/fabsdk/fabsdk_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func TestWithMSPPkg(t *testing.T) {
108108
factory := mockapisdk.NewMockMSPProviderFactory(mockCtrl)
109109

110110
factory.EXPECT().CreateUserStore(c).Return(nil, nil)
111-
factory.EXPECT().CreateProvider(c, gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
111+
factory.EXPECT().CreateIdentityManagerProvider(c, gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
112112

113113
_, err = New(WithConfig(c), WithMSPPkg(factory))
114114
if err != nil {

pkg/fabsdk/factory/defmsp/mspfactory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (f *ProviderFactory) CreateUserStore(config core.Config) (msp.UserStore, er
4747
return userStore, nil
4848
}
4949

50-
// CreateProvider returns a new default implementation of MSP provider
51-
func (f *ProviderFactory) CreateProvider(config core.Config, cryptoProvider core.CryptoSuite, userStore msp.UserStore) (msp.Provider, error) {
50+
// CreateIdentityManagerProvider returns a new default implementation of MSP provider
51+
func (f *ProviderFactory) CreateIdentityManagerProvider(config core.Config, cryptoProvider core.CryptoSuite, userStore msp.UserStore) (msp.IdentityManagerProvider, error) {
5252
return msppvdr.New(config, cryptoProvider, userStore)
5353
}

pkg/fabsdk/factory/defmsp/mspfactory_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func TestCreateIdentityManager(t *testing.T) {
116116
t.Fatalf("Unexpected error creating user store %v", err)
117117
}
118118

119-
provider, err := factory.CreateProvider(config, cryptosuite, userStore)
119+
provider, err := factory.CreateIdentityManagerProvider(config, cryptosuite, userStore)
120120
if err != nil {
121121
t.Fatalf("Unexpected error creating provider %v", err)
122122
}

pkg/fabsdk/mocks/mockfabsdkapi.gen.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/integration/msp/custom_core_factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defcore"
1313
)
1414

15-
// ========== MSP Provider Factory with custom crypto provider ============= //
15+
// ========== Core Provider Factory with custom crypto provider ============= //
1616

1717
// CustomCoreFactory is a custom factory for tests.
1818
type CustomCoreFactory struct {

test/integration/msp/custom_msp_factory.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (f *CustomMSPFactory) CreateUserStore(config core.Config) (msp.UserStore, e
3030
return f.customUserStore, nil
3131
}
3232

33-
// CreateProvider creates an MSP provider
34-
func (f *CustomMSPFactory) CreateProvider(config core.Config, cryptoProvider core.CryptoSuite, userStore msp.UserStore) (msp.Provider, error) {
35-
return f.defaultFactory.CreateProvider(config, cryptoProvider, f.customUserStore)
33+
// CreateIdentityManagerProvider creates an IdentityManager provider
34+
func (f *CustomMSPFactory) CreateIdentityManagerProvider(config core.Config, cryptoProvider core.CryptoSuite, userStore msp.UserStore) (msp.IdentityManagerProvider, error) {
35+
return f.defaultFactory.CreateIdentityManagerProvider(config, cryptoProvider, f.customUserStore)
3636
}

0 commit comments

Comments
 (0)