[FAB-1970] Remove MSP custom config block parsing

https://jira.hyperledger.org/browse/FAB-1970

The MSP implemented its own custom config block parsing as a stopgap, it
is no longer needed.

This CR removes the last vestiges of this code.  It unfortunately leaves
the mspmgmt singleton, this should be removed in a later CR.

Change-Id: I3b6fa9463bc28f31b6e0b8807d3a3780e253b8d9
Signed-off-by: Jason Yellick <[email protected]>

Author: Jason Yellick

core/peer/peer.go

@@ -182,11 +182,7 @@ func createChain(cid string, ledger ledger.PeerLedger, cb *common.Block) error {
 	}
 
 	// TODO remove once all references to mspmgmt are gone from peer code
-	// MSP is now initialized above in configtx.Manager
-	_, err = mspmgmt.GetMSPManagerFromBlock(cid, cb)
-	if err != nil {
-		return err
-	}
+	mspmgmt.XXXSetMSPManager(cid, configtxManager.MSPManager())
 
 	cs := &chainSupport{
 		Manager:    configtxManager,

msp/mgmt/config.go

@@ -26,7 +26,6 @@ import (
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/common"
 	mspprotos "github.com/hyperledger/fabric/protos/msp"
-	"github.com/hyperledger/fabric/protos/msp/utils"
 )
 
 func LoadLocalMsp(dir string) error {
@@ -83,25 +82,6 @@ func LoadFakeSetupWithLocalMspAndTestChainMsp(dir string) error {
 	return nil
 }
 
-// GetMSPManagerFromBlock returns a new MSP manager from a ConfigurationEnvelope
-// Note that chainID should really be obtained from the block. Passing it for
-// two reasons (1) efficiency (2) getting chainID from block using protos/utils
-// will cause import cycles
-func GetMSPManagerFromBlock(cid string, b *common.Block) (msp.MSPManager, error) {
-	mgrConfig, err := msputils.GetMSPManagerConfigFromBlock(b)
-	if err != nil {
-		return nil, err
-	}
-
-	mgr := GetManagerForChain(cid)
-	err = mgr.Setup(mgrConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	return mgr, nil
-}
-
 // MSPConfigHandler
 type MSPConfigHandler struct {
 	config       []*mspprotos.MSPConfig

msp/mgmt/mgmt.go

@@ -35,25 +35,17 @@ var mspLogger = logging.MustGetLogger("msp")
 
 // GetManagerForChain returns the msp manager for the supplied
 // chain; if no such manager exists, one is created
-func GetManagerForChain(ChainID string) msp.MSPManager {
-	var mspMgr msp.MSPManager
-	var created bool = false
-	{
-		m.Lock()
-		defer m.Unlock()
-
-		mspMgr = mspMap[ChainID]
-		if mspMgr == nil {
-			created = true
-			mspMgr = msp.NewMSPManager()
-			mspMap[ChainID] = mspMgr
-		}
-	}
+func GetManagerForChain(chainID string) msp.MSPManager {
+	m.Lock()
+	defer m.Unlock()
 
-	if created {
-		mspLogger.Debugf("Created new msp manager for chain %s", ChainID)
+	mspMgr, ok := mspMap[chainID]
+	if !ok {
+		mspLogger.Debugf("Created new msp manager for chain %s", chainID)
+		mspMgr = msp.NewMSPManager()
+		mspMap[chainID] = mspMgr
 	} else {
-		mspLogger.Debugf("Returning existing manager for chain %s", ChainID)
+		mspLogger.Debugf("Returning existing manager for chain %s", chainID)
 	}
 
 	return mspMgr
@@ -82,6 +74,16 @@ func GetManagerForChainIfExists(ChainID string) msp.MSPManager {
 	return mspMap[ChainID]
 }
 
+// XXXSetMSPManager is a stopgap solution to transition from the custom MSP config block
+// parsing to the configtx.Manager interface, while preserving the problematic singleton
+// nature of the MSP manager
+func XXXSetMSPManager(chainID string, manager msp.MSPManager) {
+	m.Lock()
+	defer m.Unlock()
+
+	mspMap[chainID] = manager
+}
+
 // GetLocalMSP returns the local msp (and creates it if it doesn't exist)
 func GetLocalMSP() msp.MSP {
 	var lclMsp msp.MSP

msp/mgmt/peermsp_test.go

@@ -22,8 +22,6 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric/common/util"
-	"github.com/hyperledger/fabric/msp"
-	"github.com/hyperledger/fabric/protos/msp/testutils"
 )
 
 // getTestMSPConfigPath returns the path to sampleconfig for unit tests
@@ -70,32 +68,3 @@ func TestFakeSetup(t *testing.T) {
 		t.Fatalf("There are no MSPS in the manager for chain %s", util.GetTestChainID())
 	}
 }
-
-func TestGetMSPManagerFromBlock(t *testing.T) {
-	testMSPConfigPath := getTestMSPConfigPath()
-	conf, err := msp.GetLocalMspConfig(testMSPConfigPath)
-	if err != nil {
-		t.Fatalf("GetLocalMspConfig failed, err %s", err)
-	}
-
-	block, err := msptestutils.GetTestBlockFromMspConfig(conf)
-	if err != nil {
-		t.Fatalf("getTestBlockFromMspConfig failed, err %s", err)
-	}
-
-	mgr, err := GetMSPManagerFromBlock("testchainid", block)
-	if err != nil {
-		t.Fatalf("GetMSPManagerFromBlock failed, err %s", err)
-	} else if mgr == nil {
-		t.Fatalf("Returned nil manager")
-	}
-
-	msps, err := mgr.GetMSPs()
-	if err != nil {
-		t.Fatalf("EnlistedMSPs failed, err %s", err)
-	}
-
-	if msps == nil || len(msps) == 0 {
-		t.Fatalf("There are no MSPS in the manager for chain %s", util.GetTestChainID())
-	}
-}