[FAB-8866] Rename MspID to MSPID

Change-Id: I09f9f88d0a79250eaafe8346f47689fc00c948b7
Signed-off-by: Troy Ronda <troy@troyronda.com>

pkg/client/channel/api_test.go

@@ -44,7 +44,7 @@ func TestWithTargetURLsValid(t *testing.T) {
 
 	npConfig1 := core.NetworkPeer{
 		PeerConfig: pConfig1,
-		MspID:      "MYMSP",
+		MSPID:      "MYMSP",
 	}
 
 	pConfig2 := core.PeerConfig{
@@ -53,7 +53,7 @@ func TestWithTargetURLsValid(t *testing.T) {
 
 	npConfig2 := core.NetworkPeer{
 		PeerConfig: pConfig2,
-		MspID:      "OTHERMSP",
+		MSPID:      "OTHERMSP",
 	}
 
 	mockConfig.SetCustomPeerCfg(&pConfig1)
@@ -66,7 +66,7 @@ func TestWithTargetURLsValid(t *testing.T) {
 
 	assert.Equal(t, 1, len(opts.Targets), "should have one peer")
 	assert.Equal(t, pConfig1.URL, opts.Targets[0].URL(), "", "Wrong URL")
-	assert.Equal(t, npConfig1.MspID, opts.Targets[0].MSPID(), "", "Wrong MSP")
+	assert.Equal(t, npConfig1.MSPID, opts.Targets[0].MSPID(), "", "Wrong MSP")
 }
 
 func setupMockTestContext(userName string, mspID string) *fcmocks.MockContext {

pkg/client/ledger/ledger.go

@@ -81,10 +81,10 @@ func New(channelProvider context.ChannelProvider, opts ...ClientOption) (*Client
 	// check if target filter was set - if not set the default
 	if ledgerClient.filter == nil {
 		// Default target filter is based on user msp
-		if channelContext.MspID() == "" {
+		if channelContext.MSPID() == "" {
 			return nil, errors.New("mspID not available in user context")
 		}
-		filter := &mspFilter{mspID: channelContext.MspID()}
+		filter := &mspFilter{mspID: channelContext.MSPID()}
 		ledgerClient.filter = filter
 	}
 

pkg/client/ledger/opts_test.go

@@ -44,7 +44,7 @@ func TestWithTargetURLsValid(t *testing.T) {
 
 	npConfig1 := core.NetworkPeer{
 		PeerConfig: pConfig1,
-		MspID:      "MYMSP",
+		MSPID:      "MYMSP",
 	}
 
 	pConfig2 := core.PeerConfig{
@@ -53,7 +53,7 @@ func TestWithTargetURLsValid(t *testing.T) {
 
 	npConfig2 := core.NetworkPeer{
 		PeerConfig: pConfig2,
-		MspID:      "OTHERMSP",
+		MSPID:      "OTHERMSP",
 	}
 
 	mockConfig.SetCustomPeerCfg(&pConfig1)
@@ -66,7 +66,7 @@ func TestWithTargetURLsValid(t *testing.T) {
 
 	assert.Equal(t, 1, len(opts.Targets), "should have one peer")
 	assert.Equal(t, pConfig1.URL, opts.Targets[0].URL(), "", "Wrong URL")
-	assert.Equal(t, npConfig1.MspID, opts.Targets[0].MSPID(), "", "Wrong MSP")
+	assert.Equal(t, npConfig1.MSPID, opts.Targets[0].MSPID(), "", "Wrong MSP")
 }
 
 func setupTestContext(userName string, mspID string) *fcmocks.MockContext {

pkg/client/msp/msp.go

@@ -189,7 +189,7 @@ func (c *Client) GetSigningIdentity(userName string) (*SigningIdentity, error) {
 		}
 		return nil, err
 	}
-	signingIdentity := &SigningIdentity{MspID: user.MspID(), PrivateKey: user.PrivateKey(), EnrollmentCert: user.EnrollmentCertificate()}
+	signingIdentity := &SigningIdentity{MSPID: user.MSPID(), PrivateKey: user.PrivateKey(), EnrollmentCert: user.EnrollmentCertificate()}
 	return signingIdentity, nil
 }
 

pkg/client/msp/msp_test.go

@@ -82,7 +82,7 @@ func TestMSP(t *testing.T) {
 		t.Fatalf("Enrolled user name doesn't match")
 	}
 
-	if enrolledUser.MspID() != "Org1MSP" {
+	if enrolledUser.MSPID() != "Org1MSP" {
 		t.Fatalf("Enrolled user mspID doesn't match")
 	}
 
@@ -123,7 +123,7 @@ func TestMSP(t *testing.T) {
 		t.Fatalf("Enrolled user name doesn't match")
 	}
 
-	if org2EnrolledUser.MspID() != "Org2MSP" {
+	if org2EnrolledUser.MSPID() != "Org2MSP" {
 		t.Fatalf("Enrolled user mspID doesn't match")
 	}
 
@@ -194,7 +194,7 @@ func myMSPID(t *testing.T, c core.Config) string {
 	if !ok {
 		t.Fatalf("org config retrieval failed: %v", err)
 	}
-	return orgConfig.MspID
+	return orgConfig.MSPID
 }
 
 func randomUserName() string {

pkg/client/msp/user.go

@@ -18,15 +18,15 @@ var (
 
 // Identity supplies the serialized identity and key reference.
 type Identity interface {
-	MspID() string
+	MSPID() string
 	SerializedIdentity() ([]byte, error)
 	PrivateKey() core.Key
 }
 
 // SigningIdentity is the identity object that encapsulates the user's private key for signing
 // and the user's enrollment certificate (identity)
 type SigningIdentity struct {
-	MspID          string
+	MSPID          string
 	EnrollmentCert []byte
 	PrivateKey     core.Key
 }
@@ -52,7 +52,7 @@ type IdentityManager interface {
 // An application cannot use the Peer identity to sign things because the application doesn’t
 // have access to the Peer identity’s private key.
 type User interface {
-	MspID() string
+	MSPID() string
 	Name() string
 	SerializedIdentity() ([]byte, error)
 	PrivateKey() core.Key
@@ -63,7 +63,7 @@ type User interface {
 // PrivateKey is stored separately, in the crypto store
 type UserData struct {
 	Name                  string
-	MspID                 string
+	MSPID                 string
 	EnrollmentCertificate []byte
 }
 
@@ -75,19 +75,19 @@ type UserStore interface {
 
 // UserIdentifier is the User's unique identifier
 type UserIdentifier struct {
-	MspID string
+	MSPID string
 	Name  string
 }
 
 // PrivKeyKey is a composite key for accessing a private key in the key store
 type PrivKeyKey struct {
-	MspID    string
+	MSPID    string
 	UserName string
 	SKI      []byte
 }
 
 // CertKey is a composite key for accessing a cert in the cert store
 type CertKey struct {
-	MspID    string
+	MSPID    string
 	UserName string
 }

pkg/client/resmgmt/opts_test.go

@@ -44,7 +44,7 @@ func TestWithTargetURLsValid(t *testing.T) {
 
 	npConfig1 := core.NetworkPeer{
 		PeerConfig: pConfig1,
-		MspID:      "MYMSP",
+		MSPID:      "MYMSP",
 	}
 
 	pConfig2 := core.PeerConfig{
@@ -53,7 +53,7 @@ func TestWithTargetURLsValid(t *testing.T) {
 
 	npConfig2 := core.NetworkPeer{
 		PeerConfig: pConfig2,
-		MspID:      "OTHERMSP",
+		MSPID:      "OTHERMSP",
 	}
 
 	mockConfig.SetCustomPeerCfg(&pConfig1)
@@ -66,5 +66,5 @@ func TestWithTargetURLsValid(t *testing.T) {
 
 	assert.Equal(t, 1, len(opts.Targets), "should have one peer")
 	assert.Equal(t, pConfig1.URL, opts.Targets[0].URL(), "", "Wrong URL")
-	assert.Equal(t, npConfig1.MspID, opts.Targets[0].MSPID(), "", "Wrong MSP")
+	assert.Equal(t, npConfig1.MSPID, opts.Targets[0].MSPID(), "", "Wrong MSP")
 }

pkg/client/resmgmt/resmgmt.go

@@ -154,10 +154,10 @@ func New(clientProvider context.ClientProvider, opts ...ClientOption) (*Client,
 	//check if target filter was set - if not set the default
 	if resourceClient.filter == nil {
 		// Default target filter is based on user msp
-		if ctx.MspID() == "" {
+		if ctx.MSPID() == "" {
 			return nil, errors.New("mspID not available in user context")
 		}
-		rcFilter := &mspFilter{mspID: ctx.MspID()}
+		rcFilter := &mspFilter{mspID: ctx.MSPID()}
 		resourceClient.filter = rcFilter
 	}
 	return resourceClient, nil

pkg/client/resmgmt/resmgmt_test.go

@@ -212,7 +212,7 @@ func TestJoinChannelWithOptsRequiredParameters(t *testing.T) {
 	peers = append(peers, peer1)
 
 	// Test both targets and filter provided (error condition)
-	err = rc.JoinChannel("mychannel", WithTargets(peers...), WithTargetFilter(&mspFilter{mspID: "MspID"}))
+	err = rc.JoinChannel("mychannel", WithTargets(peers...), WithTargetFilter(&mspFilter{mspID: "MSPID"}))
 	if err == nil || !strings.Contains(err.Error(), "If targets are provided, filter cannot be provided") {
 		t.Fatalf("Should have failed if both target and filter provided")
 	}
@@ -224,7 +224,7 @@ func TestJoinChannelWithOptsRequiredParameters(t *testing.T) {
 	}
 
 	// Test filter only (filter has no match)
-	err = rc.JoinChannel("mychannel", WithTargetFilter(&mspFilter{mspID: "MspID"}))
+	err = rc.JoinChannel("mychannel", WithTargetFilter(&mspFilter{mspID: "MSPID"}))
 	if err == nil || !strings.Contains(err.Error(), "No targets available") {
 		t.Fatalf("InstallCC should have failed with no targets error")
 	}

pkg/context/api/core/network.go

@@ -87,12 +87,12 @@ type ChannelPeer struct {
 // NetworkPeer combines peer info with MSP info
 type NetworkPeer struct {
 	PeerConfig
-	MspID string
+	MSPID string
 }
 
 // OrganizationConfig provides the definition of an organization in the network
 type OrganizationConfig struct {
-	MspID                  string
+	MSPID                  string
 	CryptoPath             string
 	Users                  map[string]TLSKeyPair
 	Peers                  []string

pkg/context/api/core/provider.go

@@ -24,8 +24,8 @@ type Config interface {
 	CAClientCertPath(org string) (string, error)
 	TimeoutOrDefault(TimeoutType) time.Duration
 	Timeout(TimeoutType) time.Duration
-	MspID(org string) (string, error)
-	PeerMspID(name string) (string, error)
+	MSPID(org string) (string, error)
+	PeerMSPID(name string) (string, error)
 	OrderersConfig() ([]OrdererConfig, error)
 	RandomOrdererConfig() (*OrdererConfig, error)
 	OrdererConfig(name string) (*OrdererConfig, error)

pkg/context/api/fab/provider.go

@@ -21,7 +21,7 @@ type ClientContext interface {
 	core.Providers
 	msp.Providers
 	Providers
-	MspID() string
+	MSPID() string
 	SerializedIdentity() ([]byte, error)
 	PrivateKey() core.Key
 }

pkg/context/api/msp/identitymgr.go

@@ -12,15 +12,15 @@ import (
 
 // Identity supplies the serialized identity and key reference.
 type Identity interface {
-	MspID() string
+	MSPID() string
 	SerializedIdentity() ([]byte, error)
 	PrivateKey() core.Key
 }
 
 // SigningIdentity is the identity object that encapsulates the user's private key for signing
 // and the user's enrollment certificate (identity)
 type SigningIdentity struct {
-	MspID          string
+	MSPID          string
 	EnrollmentCert []byte
 	PrivateKey     core.Key
 }

pkg/context/api/msp/user.go

@@ -31,7 +31,7 @@ var (
 // An application cannot use the Peer identity to sign things because the application doesn’t
 // have access to the Peer identity’s private key.
 type User interface {
-	MspID() string
+	MSPID() string
 	Name() string
 	SerializedIdentity() ([]byte, error)
 	PrivateKey() core.Key
@@ -42,7 +42,7 @@ type User interface {
 // PrivateKey is stored separately, in the crypto store
 type UserData struct {
 	Name                  string
-	MspID                 string
+	MSPID                 string
 	EnrollmentCertificate []byte
 }
 
@@ -54,19 +54,19 @@ type UserStore interface {
 
 // UserIdentifier is the User's unique identifier
 type UserIdentifier struct {
-	MspID string
+	MSPID string
 	Name  string
 }
 
 // PrivKeyKey is a composite key for accessing a private key in the key store
 type PrivKeyKey struct {
-	MspID    string
+	MSPID    string
 	UserName string
 	SKI      []byte
 }
 
 // CertKey is a composite key for accessing a cert in the cert store
 type CertKey struct {
-	MspID    string
+	MSPID    string
 	UserName string
 }