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

Commit 10205b2

Browse files
author
Aleksandar Likic
committed
[FAB-7917] Move packages from def to pkg/fabsdk
For now, move only def/factory and def/provider. Eventually, we'll completely remove the def package. Change-Id: I37891a0fd6b0657f09a92e0c8405e434e510e63b Signed-off-by: Aleksandar Likic <aleksandar.likic@securekey.com>
1 parent ac3975a commit 10205b2

File tree

19 files changed

+19
-19
lines changed

19 files changed

+19
-19
lines changed

‎def/fabapi/deprecated.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ package fabapi
1010
import (
1111
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
1212
"github.com/hyperledger/fabric-sdk-go/api/apilogging"
13-
"github.com/hyperledger/fabric-sdk-go/def/factory/defcore"
1413
"github.com/hyperledger/fabric-sdk-go/pkg/config"
1514
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
1615
apisdk "github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/api"
16+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defcore"
1717
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
1818

1919
"github.com/pkg/errors"

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

Lines changed: 1 addition & 1 deletion
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/factory/defsvc"
1817
"github.com/hyperledger/fabric-sdk-go/pkg/config"
1918
mocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
2019
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/selection/dynamicselection/pgresolver"
2120
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
21+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defsvc"
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"

‎pkg/fabsdk/defpkgsuite.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ package fabsdk
88

99
import (
1010
"github.com/hyperledger/fabric-sdk-go/api/apilogging"
11-
"github.com/hyperledger/fabric-sdk-go/def/factory/defclient"
12-
"github.com/hyperledger/fabric-sdk-go/def/factory/defcore"
13-
"github.com/hyperledger/fabric-sdk-go/def/factory/defsvc"
1411
apisdk "github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/api"
12+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defclient"
13+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defcore"
14+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defsvc"
1515
"github.com/hyperledger/fabric-sdk-go/pkg/logging/modlog"
1616
)
1717

‎def/factory/defclient/orgfactory.go renamed to ‎pkg/fabsdk/factory/defclient/orgfactory.go

File renamed without changes.

‎def/factory/defclient/orgfactory_test.go renamed to ‎pkg/fabsdk/factory/defclient/orgfactory_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ package defclient
99
import (
1010
"testing"
1111

12-
"github.com/hyperledger/fabric-sdk-go/def/factory/defcore"
1312
"github.com/hyperledger/fabric-sdk-go/pkg/config"
1413
credentialMgr "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/credentialmgr"
14+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defcore"
1515
)
1616

1717
/*
@@ -41,7 +41,7 @@ func TestNewMSPClient(t *testing.T) {
4141
func TestNewCredentialManager(t *testing.T) {
4242
factory := NewOrgClientFactory()
4343

44-
config, err := config.FromFile("../../../test/fixtures/config/config_test.yaml")()
44+
config, err := config.FromFile("../../../../test/fixtures/config/config_test.yaml")()
4545
if err != nil {
4646
t.Fatalf(err.Error())
4747
}

‎def/factory/defclient/sessfactory.go renamed to ‎pkg/fabsdk/factory/defclient/sessfactory.go

File renamed without changes.

‎def/factory/defclient/sessfactory_test.go renamed to ‎pkg/fabsdk/factory/defclient/sessfactory_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ package defclient
99
import (
1010
"testing"
1111

12-
"github.com/hyperledger/fabric-sdk-go/def/factory/defsvc"
12+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defsvc"
1313

1414
"github.com/golang/mock/gomock"
1515
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
1616
"github.com/hyperledger/fabric-sdk-go/api/apicore"
1717
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1818
"github.com/hyperledger/fabric-sdk-go/api/apifabclient"
19-
"github.com/hyperledger/fabric-sdk-go/def/factory/defcore"
2019
"github.com/hyperledger/fabric-sdk-go/pkg/config"
2120
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/channel"
2221
fabmocks "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
2322
chImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/chclient"
2423
chmgmtImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/chmgmtclient"
2524
resmgmtImpl "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/resmgmtclient"
2625
mockapisdk "github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/api/mocks"
26+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defcore"
2727
)
2828

2929
func TestNewChannelMgmtClient(t *testing.T) {
@@ -163,7 +163,7 @@ func newMockProviders(t *testing.T) *mockProviders {
163163
coreFactory := defcore.NewProviderFactory()
164164
svcFactory := defsvc.NewProviderFactory()
165165

166-
config, err := config.FromFile("../../../test/fixtures/config/config_test.yaml")()
166+
config, err := config.FromFile("../../../../test/fixtures/config/config_test.yaml")()
167167
if err != nil {
168168
t.Fatalf(err.Error())
169169
}

‎def/factory/defcore/corefactory.go renamed to ‎pkg/fabsdk/factory/defcore/corefactory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313
fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
1414
"github.com/hyperledger/fabric-sdk-go/api/apilogging"
1515

16-
"github.com/hyperledger/fabric-sdk-go/def/provider/fabpvdr"
1716
cryptosuiteimpl "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
1817
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
1918
kvs "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/keyvaluestore"
2019
signingMgr "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/signingmgr"
20+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/provider/fabpvdr"
2121

2222
"github.com/hyperledger/fabric-sdk-go/pkg/logging/modlog"
2323
)

‎def/factory/defcore/corefactory_test.go renamed to ‎pkg/fabsdk/factory/defcore/corefactory_test.go

Lines changed: 1 addition & 1 deletion
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/apiconfig/mocks"
1616
"github.com/hyperledger/fabric-sdk-go/api/apifabclient"
17-
"github.com/hyperledger/fabric-sdk-go/def/provider/fabpvdr"
1817
cryptosuitewrapper "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/wrapper"
1918
kvs "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/keyvaluestore"
2019
"github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/mocks"
2120
signingMgr "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/signingmgr"
21+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/provider/fabpvdr"
2222
"github.com/hyperledger/fabric-sdk-go/pkg/logging/modlog"
2323
)
2424

‎def/factory/defcore/deprecated.go renamed to ‎pkg/fabsdk/factory/defcore/deprecated.go

File renamed without changes.

‎def/factory/defsvc/svcfactory.go renamed to ‎pkg/fabsdk/factory/defsvc/svcfactory.go

File renamed without changes.

‎def/factory/defsvc/svcfactory_test.go renamed to ‎pkg/fabsdk/factory/defsvc/svcfactory_test.go

File renamed without changes.

‎pkg/fabsdk/mocks_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
1313
"github.com/hyperledger/fabric-sdk-go/api/apifabclient"
1414
"github.com/hyperledger/fabric-sdk-go/api/apilogging"
15-
"github.com/hyperledger/fabric-sdk-go/def/factory/defclient"
16-
"github.com/hyperledger/fabric-sdk-go/def/factory/defcore"
17-
"github.com/hyperledger/fabric-sdk-go/def/factory/defsvc"
1815
"github.com/hyperledger/fabric-sdk-go/pkg/errors"
1916
apisdk "github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/api"
17+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defclient"
18+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defcore"
19+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defsvc"
2020
"github.com/hyperledger/fabric-sdk-go/pkg/logging/modlog"
2121
)
2222

‎def/provider/fabpvdr/fabpvdr.go renamed to ‎pkg/fabsdk/provider/fabpvdr/fabpvdr.go

File renamed without changes.

‎def/provider/fabpvdr/fabpvdr_test.go renamed to ‎pkg/fabsdk/provider/fabpvdr/fabpvdr_test.go

File renamed without changes.

‎test/integration/orgs/multiple_orgs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
chmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/chmgmtclient"
2626
resmgmt "github.com/hyperledger/fabric-sdk-go/api/apitxn/resmgmtclient"
2727

28-
"github.com/hyperledger/fabric-sdk-go/def/factory/defsvc"
28+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defsvc"
2929
"github.com/hyperledger/fabric-sdk-go/test/integration"
3030
"github.com/hyperledger/fabric-sdk-go/test/metadata"
3131

‎test/integration/pkcs11/e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414

1515
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
1616
"github.com/hyperledger/fabric-sdk-go/api/apicryptosuite"
17-
"github.com/hyperledger/fabric-sdk-go/def/factory/defcore"
1817
cryptosuite "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/pkcs11"
18+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defcore"
1919
"github.com/hyperledger/fabric-sdk-go/test/integration/e2e"
2020
)
2121

‎test/integration/sdk/custom_cryptosuite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +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/factory/defcore"
1918
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
2019
bccspSw "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/factory/sw"
2120
"github.com/hyperledger/fabric-sdk-go/pkg/config"
2221
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/wrapper"
2322
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
23+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defcore"
2424
"github.com/hyperledger/fabric-sdk-go/test/integration"
2525
"github.com/hyperledger/fabric-sdk-go/test/metadata"
2626
)

‎test/integration/sdk/sdk_provider_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/hyperledger/fabric-sdk-go/api/apiconfig"
1919
fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
2020

21-
"github.com/hyperledger/fabric-sdk-go/def/factory/defsvc"
21+
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defsvc"
2222

2323
"github.com/hyperledger/fabric-sdk-go/pkg/config"
2424
selection "github.com/hyperledger/fabric-sdk-go/pkg/fabric-txn/selection/dynamicselection"

0 commit comments

Comments
 (0)