Skip to content

Commit

Permalink
[FAB-8464] Organize core pkg folder
Browse files Browse the repository at this point in the history 
This change moves:
pkg/config to pkg/core/config
pkg/cryptosuite to pkg/core/cryptosuite

Change-Id: I5bd3d735485af1404c656de60635e5dc2dc7e67b
Signed-off-by: Troy Ronda <troy@troyronda.com>
  • Loading branch information
@troyronda
troyronda committed Feb 23, 2018
1 parent 76be185 commit 86c95fa
Show file tree
Hide file tree
Showing 83 changed files with 88 additions and 88 deletions.
2 changes: 1 addition & 1 deletion def/fabapi/deprecated.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ SPDX-License-Identifier: Apache-2.0
package fabapi

import (
"github.com/hyperledger/fabric-sdk-go/pkg/config"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defcore"
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
Expand Down
2 changes: 1 addition & 1 deletion internal/github.com/hyperledger/fabric-ca/sdkpatch/cryptosuitebridge/cryptosuitebridge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
cspsigner "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/signer"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/utils"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/github.com/hyperledger/fabric/sdkpatch/cryptosuitebridge/cryptosuitebridge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
cspsigner "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/signer"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/utils"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/common/discovery/discoveryfilter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"testing"

"github.com/hyperledger/fabric-sdk-go/pkg/client/common/discovery/staticdiscovery"
"github.com/hyperledger/fabric-sdk-go/pkg/config"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
)

type mockFilter struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/common/discovery/greylist/greylist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"sync"
"time"

"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/common/discovery/staticdiscovery/staticdiscovery_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package staticdiscovery
import (
"testing"

"github.com/hyperledger/fabric-sdk-go/pkg/config"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
)

func TestStaticDiscovery(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/common/selection/dynamicselection/ccpolicyprovider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"testing"

"github.com/hyperledger/fabric-sdk-go/pkg/config"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/client/common/selection/dynamicselection/dynamicselection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-sdk-go/pkg/client/common/selection/dynamicselection/pgresolver"
"github.com/hyperledger/fabric-sdk-go/pkg/config"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
mocks "github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks"
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk/factory/defsvc"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/common/selection/staticselection/staticselection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package staticselection
import (
"testing"

"github.com/hyperledger/fabric-sdk-go/pkg/config"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
)

func TestStaticSelection(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/resmgmt/resmgmt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/pkg/errors"

txnmocks "github.com/hyperledger/fabric-sdk-go/pkg/client/common/mocks"
"github.com/hyperledger/fabric-sdk-go/pkg/config"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config"

"github.com/hyperledger/fabric-sdk-go/pkg/fab/channel"
fcmocks "github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks"
Expand Down
0 pkg/config/comm/comm.go → pkg/core/config/comm/comm.go
View file
File renamed without changes.
0 pkg/config/comm/comm_test.go → pkg/core/config/comm/comm_test.go
View file
File renamed without changes.
0 pkg/config/comm/testdata/server.crt → pkg/core/config/comm/testdata/server.crt
View file
File renamed without changes.
0 pkg/config/comm/testdata/server.key → pkg/core/config/comm/testdata/server.key
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/config/config.go → pkg/core/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ import (

"github.com/spf13/viper"

"github.com/hyperledger/fabric-sdk-go/pkg/config/cryptoutil"
"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/cryptoutil"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
"github.com/hyperledger/fabric-sdk-go/pkg/logging/api"
lu "github.com/hyperledger/fabric-sdk-go/pkg/logging/utils"
"github.com/pkg/errors"

cs "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite"
cs "github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite"
)

var logger = logging.NewLogger(logModule)
Expand Down
16 changes: 8 additions & 8 deletions pkg/config/config_test.go → pkg/core/config/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ var configImpl *Config
const (
org0 = "org0"
org1 = "Org1"
configTestFilePath = "../../test/fixtures/config/config_test.yaml"
configTestFilePath = "../../../test/fixtures/config/config_test.yaml"
configEmptyTestFilePath = "testdata/empty.yaml"
configPemTestFilePath = "testdata/config_test_pem.yaml"
configEmbeddedUsersTestFilePath = "../../test/fixtures/config/config_test_embedded_pems.yaml"
configEmbeddedUsersTestFilePath = "../../../test/fixtures/config/config_test_embedded_pems.yaml"
configType = "yaml"
defaultConfigPath = "testdata/template"
)
Expand Down Expand Up @@ -1013,8 +1013,8 @@ func TestInitConfigFromRawWrongType(t *testing.T) {
}

func TestTLSClientCertsFromFiles(t *testing.T) {
configImpl.networkConfig.Client.TLSCerts.Client.Cert.Path = "../../test/fixtures/config/mutual_tls/client_sdk_go.pem"
configImpl.networkConfig.Client.TLSCerts.Client.Key.Path = "../../test/fixtures/config/mutual_tls/client_sdk_go-key.pem"
configImpl.networkConfig.Client.TLSCerts.Client.Cert.Path = "../../../test/fixtures/config/mutual_tls/client_sdk_go.pem"
configImpl.networkConfig.Client.TLSCerts.Client.Key.Path = "../../../test/fixtures/config/mutual_tls/client_sdk_go-key.pem"
configImpl.networkConfig.Client.TLSCerts.Client.Cert.Pem = ""
configImpl.networkConfig.Client.TLSCerts.Client.Key.Pem = ""

Expand Down Expand Up @@ -1099,7 +1099,7 @@ YZjcDi7YEOZ3Fs1hxKmIxR+TTR2vf9I=

func TestTLSClientCertFromPemAndKeyFromFile(t *testing.T) {
configImpl.networkConfig.Client.TLSCerts.Client.Cert.Path = ""
configImpl.networkConfig.Client.TLSCerts.Client.Key.Path = "../../test/fixtures/config/mutual_tls/client_sdk_go-key.pem"
configImpl.networkConfig.Client.TLSCerts.Client.Key.Path = "../../../test/fixtures/config/mutual_tls/client_sdk_go-key.pem"

configImpl.networkConfig.Client.TLSCerts.Client.Cert.Pem = `-----BEGIN CERTIFICATE-----
MIIC5TCCAkagAwIBAgIUMYhiY5MS3jEmQ7Fz4X/e1Dx33J0wCgYIKoZIzj0EAwQw
Expand Down Expand Up @@ -1139,7 +1139,7 @@ gw2rrxqbW67ulwmMQzp6EJbm/28T2pIoYWWyIwpzrquypI7BOuf8is5b7Jcgn9oz
}

func TestTLSClientCertFromFileAndKeyFromPem(t *testing.T) {
configImpl.networkConfig.Client.TLSCerts.Client.Cert.Path = "../../test/fixtures/config/mutual_tls/client_sdk_go.pem"
configImpl.networkConfig.Client.TLSCerts.Client.Cert.Path = "../../../test/fixtures/config/mutual_tls/client_sdk_go.pem"
configImpl.networkConfig.Client.TLSCerts.Client.Key.Path = ""

configImpl.networkConfig.Client.TLSCerts.Client.Cert.Pem = ""
Expand Down Expand Up @@ -1237,7 +1237,7 @@ func TestTLSClientCertsNoCerts(t *testing.T) {
}

func TestNewGoodOpt(t *testing.T) {
_, err := FromFile("../../test/fixtures/config/config_test.yaml", goodOpt())()
_, err := FromFile("../../../test/fixtures/config/config_test.yaml", goodOpt())()
if err != nil {
t.Fatalf("Expected no error from New, but got %v", err)
}
Expand Down Expand Up @@ -1280,7 +1280,7 @@ func goodOpt() Option {
}

func TestNewBadOpt(t *testing.T) {
_, err := FromFile("../../test/fixtures/config/config_test.yaml", badOpt())()
_, err := FromFile("../../../test/fixtures/config/config_test.yaml", badOpt())()
if err == nil {
t.Fatalf("Expected error from FromFile")
}
Expand Down
0 pkg/config/cryptoutil/cryptoutils.go → pkg/core/config/cryptoutil/cryptoutils.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/config/cryptoutil/cryptoutils_test.go → ...ore/config/cryptoutil/cryptoutils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"

fabricCaUtil "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite"
)

func TestGetPrivateKeyFromCert(t *testing.T) {
Expand Down
0 pkg/config/subst.go → pkg/core/config/subst.go
View file
File renamed without changes.
0 pkg/config/subst_test.go → pkg/core/config/subst_test.go
View file
File renamed without changes.
0 pkg/config/test.yaml → pkg/core/config/test.yaml
View file
File renamed without changes.
0 pkg/config/testdata/config_test_pem.yaml → ...core/config/testdata/config_test_pem.yaml
View file
File renamed without changes.
0 pkg/config/testdata/empty.yaml → pkg/core/config/testdata/empty.yaml
View file
File renamed without changes.
0 pkg/config/testdata/template/config.yaml → ...core/config/testdata/template/config.yaml
View file
File renamed without changes.
0 pkg/config/urlutil/urlutils.go → pkg/core/config/urlutil/urlutils.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...suite/bccsp/multisuite/cryptosuiteimpl.go → ...suite/bccsp/multisuite/cryptosuiteimpl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ package multisuite

import (
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/pkcs11"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/pkcs11"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/sw"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion .../bccsp/multisuite/cryptosuiteimpl_test.go → .../bccsp/multisuite/cryptosuiteimpl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/pkcs11"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core/mocks"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/wrapper"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/wrapper"
)

func TestBadConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ...yptosuite/bccsp/pkcs11/cryptosuiteimpl.go → ...yptosuite/bccsp/pkcs11/cryptosuiteimpl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
bccspPkcs11 "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/factory/pkcs11"
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/pkcs11"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/wrapper"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/wrapper"
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
"github.com/pkg/errors"
)
Expand Down
0 ...uite/bccsp/pkcs11/cryptosuiteimpl_test.go → ...uite/bccsp/pkcs11/cryptosuiteimpl_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/cryptosuite/bccsp/sw/cryptosuiteimpl.go → ...e/cryptosuite/bccsp/sw/cryptosuiteimpl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
bccspSw "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp/factory/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/wrapper"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/wrapper"
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
"github.com/pkg/errors"
)
Expand Down
0 ...ptosuite/bccsp/sw/cryptosuiteimpl_test.go → ...ptosuite/bccsp/sw/cryptosuiteimpl_test.go
View file
File renamed without changes.
0 ...ptosuite/bccsp/wrapper/cryptosuiteimpl.go → ...ptosuite/bccsp/wrapper/cryptosuiteimpl.go
View file
File renamed without changes.
0 ...ite/bccsp/wrapper/cryptosuiteimpl_test.go → ...ite/bccsp/wrapper/cryptosuiteimpl_test.go
View file
File renamed without changes.
0 ...yptosuite/bccsp/wrapper/mocksuite_test.go → ...yptosuite/bccsp/wrapper/mocksuite_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/cryptosuite/cryptosuite.go → pkg/core/cryptosuite/cryptosuite.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cryptosuite/cryptosuite_test.go → pkg/core/cryptosuite/cryptosuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"sync/atomic"

"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/logging/utils"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/fab/ca/fabricca.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

api "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/api"
fabric_ca "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
config "github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/logging"

contextApi "github.com/hyperledger/fabric-sdk-go/pkg/context/api"
Expand Down
6 changes: 3 additions & 3 deletions pkg/fab/ca/fabricca_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core/mocks"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite"
cryptosuiteimpl "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
bccspwrapper "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/wrapper"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite"
cryptosuiteimpl "github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/sw"
bccspwrapper "github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/wrapper"
"github.com/hyperledger/fabric-sdk-go/pkg/fab/ca/mocks"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/fab/channel/block.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
ab "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/orderer"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"

ccomm "github.com/hyperledger/fabric-sdk-go/pkg/config/comm"
ccomm "github.com/hyperledger/fabric-sdk-go/pkg/core/config/comm"
"github.com/hyperledger/fabric-sdk-go/pkg/fab/txn"
"github.com/pkg/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/fab/channel/transactor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"

"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/fab/orderer"
"github.com/hyperledger/fabric-sdk-go/pkg/fab/txn"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/fab/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/hyperledger/fabric-sdk-go/pkg/context/api"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core/mocks"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/fab/identity"
mocks "github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/fab/credentialmgr/credentialmgr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"path/filepath"
"strings"

"github.com/hyperledger/fabric-sdk-go/pkg/config/cryptoutil"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/cryptoutil"

fabricCaUtil "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api"
Expand Down
6 changes: 3 additions & 3 deletions pkg/fab/credentialmgr/credentialmgr_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"testing"

fabricCaUtil "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric-sdk-go/pkg/config"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/fab/identity"
fcmocks "github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions pkg/fab/credentialmgr/enrollment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
camocks "github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab/mocks"
"github.com/hyperledger/fabric-sdk-go/pkg/fab/identity"

"github.com/hyperledger/fabric-sdk-go/pkg/config"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/sw"
)

func TestCredentialManagerWithEnrollment(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/fab/events/consumer/consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"google.golang.org/grpc/keepalive"

"github.com/golang/protobuf/ptypes"
"github.com/hyperledger/fabric-sdk-go/pkg/config/comm"
ccomm "github.com/hyperledger/fabric-sdk-go/pkg/config/comm"
"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/comm"
ccomm "github.com/hyperledger/fabric-sdk-go/pkg/core/config/comm"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
ehpb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"

Expand Down
2 changes: 1 addition & 1 deletion pkg/fab/events/eventhub.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"crypto/x509"

cnsmr "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/events/consumer"
"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/context"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/fab"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/errors/status"
consumer "github.com/hyperledger/fabric-sdk-go/pkg/fab/events/consumer"
"github.com/hyperledger/fabric-sdk-go/pkg/logging"
Expand Down
2 changes: 1 addition & 1 deletion pkg/fab/identity/certfileuserstore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
package identity

import (
"github.com/hyperledger/fabric-sdk-go/pkg/config/cryptoutil"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/cryptoutil"
"github.com/hyperledger/fabric-sdk-go/pkg/fab/keyvaluestore"

contextApi "github.com/hyperledger/fabric-sdk-go/pkg/context/api"
Expand Down
2 changes: 1 addition & 1 deletion pkg/fab/identity/certfileuserstore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/hyperledger/fabric-sdk-go/pkg/context/api"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core/mocks"
"github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/sw"
"github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/sw"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/fab/identity/identity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"io/ioutil"

bccspwrapper "github.com/hyperledger/fabric-sdk-go/pkg/cryptosuite/bccsp/wrapper"
bccspwrapper "github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/wrapper"
"github.com/hyperledger/fabric-sdk-go/pkg/fab/ca/mocks"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/fab/orderer/deprecated.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ SPDX-License-Identifier: Apache-2.0
package orderer

import (
"github.com/hyperledger/fabric-sdk-go/pkg/config/comm"
"github.com/hyperledger/fabric-sdk-go/pkg/config/urlutil"
"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/comm"
"github.com/hyperledger/fabric-sdk-go/pkg/core/config/urlutil"
"github.com/spf13/cast"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
Loading

0 comments on commit 86c95fa

Please sign in to comment.