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>

Author: mbrandenburger

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

@@ -18,7 +18,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common/pkcs11"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
-	fabricmsp "github.com/hyperledger/fabric/msp"
+	fabricmsp "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
 	"gopkg.in/yaml.v2"
 )
 

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

@@ -14,7 +14,7 @@ import (
 	ca2 "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/cmd/cryptogen/ca"
 	msp2 "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/cmd/cryptogen/msp"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
-	fabricmsp "github.com/hyperledger/fabric/msp"
+	fabricmsp "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v2"
 )

integration/nwo/fabric/identity/identity.go

@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
 	"github.com/hyperledger/fabric-lib-go/bccsp/sw"
-	"github.com/hyperledger/fabric/msp"
 )
 
 //go:generate counterfeiter -o client/mock/identity.go -fake-name Identity . Identity

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

@@ -12,10 +12,10 @@ import (
 
 	idemix2 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/msp/idemix"
 	x5092 "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/msp/x509"
+	fabricmsp "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
 	sig2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/sig"
 	mem "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/driver/memory"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/storage/kvs"
-	msp2 "github.com/hyperledger/fabric/msp"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -31,7 +31,7 @@ func TestInfoIdemix(t *testing.T) {
 	assert.NoError(t, err)
 	sigService := sig2.NewService(sig2.NewMultiplexDeserializer(), auditInfo, signerInfo)
 
-	config, err := msp2.GetLocalMspConfigWithType("./testdata/idemix", nil, "idemix", "idemix")
+	config, err := fabricmsp.GetLocalMspConfigWithType("./testdata/idemix", nil, "idemix", "idemix")
 	assert.NoError(t, err)
 
 	p, err := idemix2.NewProviderWithEidRhNymPolicy(config, kvss, sigService)

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

@@ -9,10 +9,10 @@ package channelconfig
 import (
 	"time"
 
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
 	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	ab "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
 	pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
-	"github.com/hyperledger/fabric/msp"
 )
 
 // Org stores the common organizational config

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

@@ -7,8 +7,8 @@ SPDX-License-Identifier: Apache-2.0
 package capabilities
 
 import (
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
 	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
-	"github.com/hyperledger/fabric/msp"
 )
 
 const (

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

@@ -9,8 +9,8 @@ package capabilities
 import (
 	"testing"
 
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
 	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
-	"github.com/hyperledger/fabric/msp"
 	"github.com/stretchr/testify/require"
 )
 

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

@@ -12,9 +12,9 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/core/generic/membership/channelconfig/capabilities"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
 	"github.com/hyperledger/fabric-lib-go/bccsp"
 	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
-	"github.com/hyperledger/fabric/msp"
 )
 
 // Channel config keys

platform/fabric/core/generic/membership/channelconfig/msp.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp/cache"
 	"github.com/hyperledger/fabric-lib-go/bccsp"
 	mspprotos "github.com/hyperledger/fabric-protos-go-apiv2/msp"
-	"github.com/hyperledger/fabric/msp"
-	"github.com/hyperledger/fabric/msp/cache"
 )
 
 type pendingMSPConfig struct {

platform/fabric/core/generic/membership/channelconfig/msp_test.go

@@ -7,19 +7,18 @@ SPDX-License-Identifier: Apache-2.0
 package channelconfig
 
 import (
+	"path/filepath"
 	"testing"
 
+	"github.com/hyperledger-labs/fabric-smart-client/platform/fabric/msp"
 	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
 	"github.com/hyperledger/fabric-lib-go/bccsp/sw"
 	mspprotos "github.com/hyperledger/fabric-protos-go-apiv2/msp"
-	"github.com/hyperledger/fabric/core/config/configtest"
-	"github.com/hyperledger/fabric/msp"
 	"github.com/stretchr/testify/require"
 )
 
 func TestMSPConfigManager(t *testing.T) {
 	mspDir := getDevMspDir()
-	t.Logf("mspDir: %s", mspDir)
 	conf, err := msp.GetLocalMspConfig(mspDir, nil, "SampleOrg")
 	require.NoError(t, err)
 
@@ -51,8 +50,12 @@ func TestMSPConfigManager(t *testing.T) {
 }
 
 func getDevMspDir() string {
-	// TODO replace once MSP import resolved
-	return configtest.GetDevMspDir()
+	// TODO can we do this somehow better?
+	mspDir, err := filepath.Abs("../../../../msp/testdata/sampleconfig")
+	if err != nil {
+		panic(err)
+	}
+	return mspDir
 }
 
 func TestMSPConfigFailure(t *testing.T) {