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

Commit e084baf

Browse files
troyrondatroyronda
committed
[FAB-7622] Update tests to use fabsdk.New
Change-Id: Icb5811532eb4ef2d9c77e0d38c8c1e85a900ffbc Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent ed3dc93 commit e084baf

File tree

9 files changed

+63
-61
lines changed

9 files changed

+63
-61
lines changed

‎pkg/fabric-txn/selection/dynamicselection/ccpolicyprovider_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@ package dynamicselection
99
import (
1010
"testing"
1111

12-
"github.com/hyperledger/fabric-sdk-go/def/fabapi"
12+
"github.com/hyperledger/fabric-sdk-go/pkg/config"
13+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
1314
)
1415

1516
func TestCCPolicyProvider(t *testing.T) {
16-
1717
// Create SDK setup for channel client with dynamic selection
18-
sdkOptions := fabapi.Options{
19-
ConfigFile: "../../../../test/fixtures/config/config_test.yaml",
18+
c, err := config.FromFile("../../../../test/fixtures/config/config_test.yaml")
19+
if err != nil {
20+
t.Fatalf("Failed to load config: %s", err)
2021
}
2122

22-
sdk, err := fabapi.NewSDK(sdkOptions)
23+
sdk, err := fabsdk.New(c)
2324
if err != nil {
2425
t.Fatalf("Failed to create new SDK: %s", err)
2526
}

‎pkg/fabric-txn/selection/dynamicselection/dynamicselection_test.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
1515
"github.com/hyperledger/fabric-sdk-go/api/apifabclient"
1616
"github.com/hyperledger/fabric-sdk-go/api/apilogging"
17-
"github.com/hyperledger/fabric-sdk-go/def/fabapi"
1817
"github.com/hyperledger/fabric-sdk-go/def/factory/defsvc"
1918
"github.com/hyperledger/fabric-sdk-go/pkg/config"
2019
mocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
2120
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/selection/dynamicselection/pgresolver"
21+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
2222
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
2323
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/core/common/ccprovider"
2424
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
@@ -348,12 +348,7 @@ func TestDynamicSelection(t *testing.T) {
348348
}
349349

350350
// Create SDK setup for channel client with dynamic selection
351-
sdkOptions := fabapi.Options{
352-
ConfigFile: "../../../../test/fixtures/config/config_test.yaml",
353-
ServiceFactory: &DynamicSelectionProviderFactory{ChannelUsers: []ChannelUser{mychannelUser}},
354-
}
355-
356-
sdk, err := fabapi.NewSDK(sdkOptions)
351+
sdk, err := fabsdk.New(config, fabsdk.WithServicePkg(&DynamicSelectionProviderFactory{ChannelUsers: []ChannelUser{mychannelUser}}))
357352
if err != nil {
358353
t.Fatalf("Failed to create new SDK: %s", err)
359354
}

‎test/integration/base_test_setup.go‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ SPDX-License-Identifier: Apache-2.0
77
package integration
88

99
import (
10+
"crypto/x509"
11+
"fmt"
1012
"os"
1113
"path"
1214
"testing"
@@ -18,22 +20,16 @@ import (
1820
"github.com/hyperledger/fabric-sdk-go/api/apitxn"
1921
chmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/chmgmtclient"
2022
resmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/resmgmtclient"
21-
packager "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/ccpackager/gopackager"
22-
pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
23-
24-
"crypto/x509"
25-
26-
"fmt"
27-
28-
deffab "github.com/hyperledger/fabric-sdk-go/def/fabapi"
2923
"github.com/hyperledger/fabric-sdk-go/pkg/config"
3024
"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
3125
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
26+
packager "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/ccpackager/gopackager"
3227
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/events"
3328
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/orderer"
3429
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/peer"
3530
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
3631
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
32+
pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
3733
)
3834

3935
// BaseSetupImpl implementation of BaseTestSetup
@@ -90,11 +86,12 @@ func ExampleCCUpgradeArgs() [][]byte {
9086
// Initialize reads configuration from file and sets up client, channel and event hub
9187
func (setup *BaseSetupImpl) Initialize(t *testing.T) error {
9288
// Create SDK setup for the integration tests
93-
sdkOptions := deffab.Options{
94-
ConfigFile: setup.ConfigFile,
89+
c, err := config.FromFile(setup.ConfigFile)
90+
if err != nil {
91+
t.Fatalf("Failed to load config: %s", err)
9592
}
9693

97-
sdk, err := deffab.NewSDK(sdkOptions)
94+
sdk, err := fabsdk.New(c)
9895
if err != nil {
9996
return errors.WithMessage(err, "SDK init failed")
10097
}

‎test/integration/e2e/end_to_end.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@ import (
1212
"testing"
1313
"time"
1414

15+
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
16+
1517
"github.com/hyperledger/fabric-sdk-go/api/apitxn"
16-
"github.com/hyperledger/fabric-sdk-go/def/fabapi"
1718
"github.com/hyperledger/fabric-sdk-go/test/integration"
1819
"github.com/hyperledger/fabric-sdk-go/test/metadata"
1920
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/common/cauthdsl"
2021

2122
chmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/chmgmtclient"
2223
resmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/resmgmtclient"
2324

25+
"github.com/hyperledger/fabric-sdk-go/pkg/config"
2426
packager "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/ccpackager/gopackager"
2527
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
2628
)
@@ -33,18 +35,18 @@ const (
3335
)
3436

3537
func runWithConfigFixture(t *testing.T) {
36-
// Create SDK setup for the integration tests
37-
sdkOptions := fabapi.Options{
38-
ConfigFile: "../" + integration.ConfigTestFile,
38+
c, err := config.FromFile("../" + integration.ConfigTestFile)
39+
if err != nil {
40+
t.Fatalf("Failed to load config: %s", err)
3941
}
4042

41-
Run(t, sdkOptions)
43+
Run(t, c)
4244
}
4345

4446
// Run enables testing an end-to-end scenario against the supplied SDK options
45-
func Run(t *testing.T, sdkOptions fabapi.Options) {
47+
func Run(t *testing.T, config apiconfig.Config, sdkOpts ...fabsdk.Option) {
4648

47-
sdk, err := fabapi.NewSDK(sdkOptions)
49+
sdk, err := fabsdk.New(config, sdkOpts...)
4850
if err != nil {
4951
t.Fatalf("Failed to create new SDK: %s", err)
5052
}

‎test/integration/orgs/multiple_orgs_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ import (
1313
"testing"
1414
"time"
1515

16+
"github.com/hyperledger/fabric-sdk-go/pkg/config"
1617
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
1718
packager "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/ccpackager/gopackager"
1819
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/peer"
1920
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
2021

2122
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
2223
fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
23-
2424
"github.com/hyperledger/fabric-sdk-go/api/apitxn"
2525
chmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/chmgmtclient"
2626
resmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/resmgmtclient"
27-
"github.com/hyperledger/fabric-sdk-go/def/fabapi"
27+
2828
"github.com/hyperledger/fabric-sdk-go/def/factory/defsvc"
2929
"github.com/hyperledger/fabric-sdk-go/test/integration"
3030
"github.com/hyperledger/fabric-sdk-go/test/metadata"
@@ -50,11 +50,12 @@ var orgTestPeer1 fab.Peer
5050
func TestOrgsEndToEnd(t *testing.T) {
5151

5252
// Create SDK setup for the integration tests
53-
sdkOptions := fabapi.Options{
54-
ConfigFile: "../" + integration.ConfigTestFile,
53+
c, err := config.FromFile("../" + integration.ConfigTestFile)
54+
if err != nil {
55+
t.Fatalf("Failed to load config: %s", err)
5556
}
5657

57-
sdk, err := fabapi.NewSDK(sdkOptions)
58+
sdk, err := fabsdk.New(c)
5859
if err != nil {
5960
t.Fatalf("Failed to create new SDK: %s", err)
6061
}
@@ -209,8 +210,7 @@ func TestOrgsEndToEnd(t *testing.T) {
209210
mychannelUser := selection.ChannelUser{ChannelID: "orgchannel", UserName: "User1", OrgName: "Org1"}
210211

211212
// Create SDK setup for channel client with dynamic selection
212-
sdkOptions.ServiceFactory = &DynamicSelectionProviderFactory{ChannelUsers: []selection.ChannelUser{mychannelUser}}
213-
sdk, err = fabapi.NewSDK(sdkOptions)
213+
sdk, err = fabsdk.New(c, fabsdk.WithServicePkg(&DynamicSelectionProviderFactory{ChannelUsers: []selection.ChannelUser{mychannelUser}}))
214214
if err != nil {
215215
t.Fatalf("Failed to create new SDK: %s", err)
216216
}

‎test/integration/pkcs11/e2e_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,24 @@ package pkcs11
99
import (
1010
"testing"
1111

12+
"github.com/hyperledger/fabric-sdk-go/pkg/config"
13+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
14+
1215
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
1316
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
14-
"github.com/hyperledger/fabric-sdk-go/def/fabapi"
1517
"github.com/hyperledger/fabric-sdk-go/def/factory/defcore"
1618
cryptosuite "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/pkcs11"
1719
"github.com/hyperledger/fabric-sdk-go/test/integration/e2e"
1820
)
1921

2022
func TestE2E(t *testing.T) {
2123
// Create SDK setup for the integration tests
22-
sdkOptions := fabapi.Options{
23-
ConfigFile: "../" + ConfigTestFile,
24-
CoreFactory: &CustomCryptoSuiteProviderFactory{},
24+
c, err := config.FromFile("../" + ConfigTestFile)
25+
if err != nil {
26+
t.Fatalf("Failed to load config: %s", err)
2527
}
2628

27-
e2e.Run(t, sdkOptions)
29+
e2e.Run(t, c, fabsdk.WithCorePkg(&CustomCryptoSuiteProviderFactory{}))
2830
}
2931

3032
// CustomCryptoSuiteProviderFactory is will provide custom cryptosuite (bccsp.BCCSP)

‎test/integration/sdk/channel_client_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ import (
1414
"github.com/hyperledger/fabric-sdk-go/api/apitxn"
1515
pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
1616

17-
"github.com/hyperledger/fabric-sdk-go/def/fabapi"
17+
"github.com/hyperledger/fabric-sdk-go/pkg/config"
1818
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
19+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
1920
"github.com/hyperledger/fabric-sdk-go/test/integration"
2021
"github.com/hyperledger/fabric-sdk-go/test/metadata"
2122
)
@@ -43,11 +44,12 @@ func TestChannelClient(t *testing.T) {
4344
}
4445

4546
// Create SDK setup for the integration tests
46-
sdkOptions := fabapi.Options{
47-
ConfigFile: testSetup.ConfigFile,
47+
c, err := config.FromFile(testSetup.ConfigFile)
48+
if err != nil {
49+
t.Fatalf("Failed to load config: %s", err)
4850
}
4951

50-
sdk, err := fabapi.NewSDK(sdkOptions)
52+
sdk, err := fabsdk.New(c)
5153
if err != nil {
5254
t.Fatalf("Failed to create new SDK: %s", err)
5355
}

‎test/integration/sdk/custom_cryptosuite_test.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ import (
1515
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
1616
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1717
"github.com/hyperledger/fabric-sdk-go/api/apitxn"
18-
"github.com/hyperledger/fabric-sdk-go/def/fabapi"
1918
"github.com/hyperledger/fabric-sdk-go/def/factory/defcore"
2019
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
2120
bccspSw "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/factory/sw"
21+
"github.com/hyperledger/fabric-sdk-go/pkg/config"
2222
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/wrapper"
23+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
2324
"github.com/hyperledger/fabric-sdk-go/test/integration"
2425
"github.com/hyperledger/fabric-sdk-go/test/metadata"
2526
)
@@ -55,12 +56,13 @@ func TestEndToEndForCustomCryptoSuite(t *testing.T) {
5556
customBccspProvider := getTestBCCSP(defaultConfig)
5657

5758
// Create SDK setup with custom cryptosuite provider factory
58-
sdkOptions := fabapi.Options{
59-
ConfigFile: testSetup.ConfigFile,
60-
CoreFactory: &CustomCryptoSuiteProviderFactory{bccspProvider: customBccspProvider},
59+
c, err := config.FromFile(testSetup.ConfigFile)
60+
if err != nil {
61+
t.Fatalf("Failed to load config: %s", err)
6162
}
6263

63-
sdk, err := fabapi.NewSDK(sdkOptions)
64+
sdk, err := fabsdk.New(c, fabsdk.WithCorePkg(&CustomCryptoSuiteProviderFactory{bccspProvider: customBccspProvider}))
65+
6466
if err != nil {
6567
t.Fatalf("Failed to create new SDK: %s", err)
6668
}
@@ -144,13 +146,12 @@ func TestCustomCryptoSuite(t *testing.T) {
144146
//Get BCCSP custom wrapper for Test BCCSP
145147
customBccspWrapper := getBCCSPWrapper(customBccspProvider)
146148

147-
// Create SDK setup with custom cryptosuite provider factory
148-
sdkOptions := fabapi.Options{
149-
ConfigFile: testSetup.ConfigFile,
150-
CoreFactory: &CustomCryptoSuiteProviderFactory{bccspProvider: customBccspWrapper},
149+
c, err := config.FromFile(testSetup.ConfigFile)
150+
if err != nil {
151+
t.Fatalf("Failed to load config: %s", err)
151152
}
152153

153-
sdk, err := fabapi.NewSDK(sdkOptions)
154+
sdk, err := fabsdk.New(c, fabsdk.WithCorePkg(&CustomCryptoSuiteProviderFactory{bccspProvider: customBccspWrapper}))
154155
if err != nil {
155156
t.Fatalf("Failed to create new SDK: %s", err)
156157
}

‎test/integration/sdk/sdk_provider_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"testing"
1313

1414
"github.com/hyperledger/fabric-sdk-go/api/apitxn"
15-
"github.com/hyperledger/fabric-sdk-go/def/fabapi"
1615
"github.com/hyperledger/fabric-sdk-go/test/integration"
1716
"github.com/hyperledger/fabric-sdk-go/test/metadata"
1817

@@ -21,7 +20,9 @@ import (
2120

2221
"github.com/hyperledger/fabric-sdk-go/def/factory/defsvc"
2322

23+
"github.com/hyperledger/fabric-sdk-go/pkg/config"
2424
selection "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/selection/dynamicselection"
25+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
2526
)
2627

2728
func TestDynamicSelection(t *testing.T) {
@@ -47,12 +48,13 @@ func TestDynamicSelection(t *testing.T) {
4748
mychannelUser := selection.ChannelUser{ChannelID: testSetup.ChannelID, UserName: "User1", OrgName: "Org1"}
4849

4950
// Create SDK setup for channel client with dynamic selection
50-
sdkOptions := fabapi.Options{
51-
ConfigFile: testSetup.ConfigFile,
52-
ServiceFactory: &DynamicSelectionProviderFactory{ChannelUsers: []selection.ChannelUser{mychannelUser}},
51+
c, err := config.FromFile(testSetup.ConfigFile)
52+
if err != nil {
53+
t.Fatalf("Failed to load config: %s", err)
5354
}
5455

55-
sdk, err := fabapi.NewSDK(sdkOptions)
56+
sdk, err := fabsdk.New(c, fabsdk.WithServicePkg(&DynamicSelectionProviderFactory{ChannelUsers: []selection.ChannelUser{mychannelUser}}))
57+
5658
if err != nil {
5759
t.Fatalf("Failed to create new SDK: %s", err)
5860
}

0 commit comments

Comments
 (0)
⚡