[FAB-14324] remove argument from channel.GetMSPIDs

- Peer gets channel based on name and then delegates to channel object - make necessary adjustments to validator ChannelResource and support Change-Id: I6d0651f1b38ce4d07676df060a5a261fa91b0799 Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
hyperledger · Jun 4, 2019 · f760891 · f760891
1 parent b4816a6
commit f760891
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 31 deletions.
diff --git a/core/committer/txvalidator/v14/validator.go b/core/committer/txvalidator/v14/validator.go
@@ -54,7 +54,7 @@ type ChannelResources interface {
 
 	// GetMSPIDs returns the IDs for the application MSPs
 	// that have been defined in the channel
-	GetMSPIDs(cid string) []string
+	GetMSPIDs() []string
 
 	// Capabilities defines the capabilities for the application portion of this channel
 	Capabilities() channelconfig.ApplicationCapabilities

diff --git a/core/committer/txvalidator/v14/vscc_validator.go b/core/committer/txvalidator/v14/vscc_validator.go
@@ -343,7 +343,7 @@ func (v *VsccValidatorImpl) GetInfoForValidate(chdr *common.ChannelHeader, ccID
 		// when we are validating a system CC, we use the default
 		// VSCC and a default policy that requires one signature
 		// from any of the members of the channel
-		p := cauthdsl.SignedByAnyMember(v.cr.GetMSPIDs(chdr.ChannelId))
+		p := cauthdsl.SignedByAnyMember(v.cr.GetMSPIDs())
 		policy, err = protoutil.Marshal(p)
 		if err != nil {
 			return nil, nil, nil, err

diff --git a/core/committer/txvalidator/v20/mocks/channel_resources.go b/core/committer/txvalidator/v20/mocks/channel_resources.go
diff --git a/core/committer/txvalidator/v20/plugindispatcher/dispatcher.go b/core/committer/txvalidator/v20/plugindispatcher/dispatcher.go
@@ -27,7 +27,7 @@ import (
 type ChannelResources interface {
 	// GetMSPIDs returns the IDs for the application MSPs
 	// that have been defined in the channel
-	GetMSPIDs(cid string) []string
+	GetMSPIDs() []string
 }
 
 // LedgerResources provides access to ledger artefacts or

diff --git a/core/committer/txvalidator/v20/validator.go b/core/committer/txvalidator/v20/validator.go
@@ -50,7 +50,7 @@ type ChannelResources interface {
 
 	// GetMSPIDs returns the IDs for the application MSPs
 	// that have been defined in the channel
-	GetMSPIDs(cid string) []string
+	GetMSPIDs() []string
 
 	// Capabilities defines the capabilities for the application portion of this channel
 	Capabilities() channelconfig.ApplicationCapabilities

diff --git a/core/mocks/txvalidator/support.go b/core/mocks/txvalidator/support.go
@@ -67,7 +67,7 @@ func (ms *Support) PolicyManager() policies.Manager {
 	return &mockpolicies.Manager{}
 }
 
-func (ms *Support) GetMSPIDs(cid string) []string {
+func (ms *Support) GetMSPIDs() []string {
 	return []string{"SampleOrg"}
 }
 

diff --git a/core/peer/peer.go b/core/peer/peer.go
@@ -152,8 +152,18 @@ func (c *chain) Capabilities() channelconfig.ApplicationCapabilities {
 	return c.cs.Capabilities()
 }
 
-func (c *chain) GetMSPIDs(cid string) []string {
-	return GetMSPIDs(cid)
+func (c *chain) GetMSPIDs() []string {
+	ac, ok := c.cs.ApplicationConfig()
+	if !ok || ac.Organizations() == nil {
+		return nil
+	}
+
+	var mspIDs []string
+	for _, org := range ac.Organizations() {
+		mspIDs = append(mspIDs, org.MSPID())
+	}
+
+	return mspIDs
 }
 
 func (c *chain) MSPManager() msp.MSPManager {
@@ -712,26 +722,12 @@ func (p *Peer) GetMSPIDs(cid string) []string {
 	chains.RLock()
 	defer chains.RUnlock()
 
-	if c, ok := chains.list[cid]; ok {
-		if c == nil || c.cs == nil {
-			return nil
-		}
-		ac, ok := c.cs.ApplicationConfig()
-		if !ok || ac.Organizations() == nil {
-			return nil
-		}
-
-		orgs := ac.Organizations()
-		toret := make([]string, len(orgs))
-		i := 0
-		for _, org := range orgs {
-			toret[i] = org.MSPID()
-			i++
-		}
-
-		return toret
+	c, ok := chains.list[cid]
+	if !ok {
+		return nil
 	}
-	return nil
+
+	return c.GetMSPIDs()
 }
 
 // GetPolicyManager returns the policy manager of the chain with chain ID. Note that this