[FAB-1962] Utilize templates in peer test

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

The peer already depends on the orderer template, but is not currently
using the peer or MSP templates. Where appropriate, especially the MSP
template should be utilized.

This CR removes the last vestiges of the old MSP manual encoding which
the peer depended upon.

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

Author: Jason Yellick

common/configtx/test/helper.go

@@ -46,13 +46,17 @@ var ordererTemplate configtx.Template
 var mspTemplate configtx.Template
 var peerTemplate configtx.Template
 
+var compositeTemplate configtx.Template
+
 var genesisFactory genesis.Factory
 
 func init() {
 	ordererTemplate = readTemplate(OrdererTemplateName)
 	mspTemplate = readTemplate(MSPTemplateName)
 	peerTemplate = readTemplate(PeerTemplateName)
-	genesisFactory = genesis.NewFactoryImpl(configtx.NewCompositeTemplate(mspTemplate, ordererTemplate, peerTemplate))
+
+	compositeTemplate = configtx.NewCompositeTemplate(mspTemplate, ordererTemplate, peerTemplate)
+	genesisFactory = genesis.NewFactoryImpl(compositeTemplate)
 }
 
 func resolveName(name string) (string, []byte) {
@@ -115,3 +119,8 @@ func MSPTemplate() configtx.Template {
 func PeerTemplate() configtx.Template {
 	return peerTemplate
 }
+
+// CompositeTemplate returns the composite template of peer, orderer, and MSP
+func CompositeTemplate() configtx.Template {
+	return compositeTemplate
+}

core/common/validation/config_test.go

@@ -19,20 +19,14 @@ package validation
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/common/chainconfig"
 	"github.com/hyperledger/fabric/common/configtx"
-	"github.com/hyperledger/fabric/common/configtx/test"
+	configtxtest "github.com/hyperledger/fabric/common/configtx/test"
 	"github.com/hyperledger/fabric/common/util"
-	"github.com/hyperledger/fabric/protos/utils"
 )
 
 func TestValidateConfigTx(t *testing.T) {
 	chainID := util.GetTestChainID()
-	oTemplate := test.OrdererTemplate()
-	mspcfg := configtx.NewSimpleTemplate(utils.EncodeMSPUnsigned(chainID))
-	chainCfg := configtx.NewSimpleTemplate(chainconfig.DefaultHashingAlgorithm())
-	chCrtTemp := configtx.NewCompositeTemplate(oTemplate, mspcfg, chainCfg)
-	chCrtEnv, err := configtx.MakeChainCreationTransaction(test.AcceptAllPolicyKey, chainID, signer, chCrtTemp)
+	chCrtEnv, err := configtx.MakeChainCreationTransaction(configtxtest.AcceptAllPolicyKey, chainID, signer, configtxtest.CompositeTemplate())
 	if err != nil {
 		t.Fatalf("MakeChainCreationTransaction failed, err %s", err)
 		return

msp/mgmt/peermsp_test.go

@@ -17,16 +17,26 @@ limitations under the License.
 package mgmt
 
 import (
+	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/msp/testutils"
-	"github.com/hyperledger/fabric/protos/utils"
 )
 
+// getTestMSPConfigPath returns the path to sampleconfig for unit tests
+func getTestMSPConfigPath() string {
+	cfgPath := os.Getenv("PEER_CFG_PATH") + "/msp/sampleconfig/"
+	if _, err := ioutil.ReadDir(cfgPath); err != nil {
+		cfgPath = os.Getenv("GOPATH") + "/src/github.com/hyperledger/fabric/msp/sampleconfig/"
+	}
+	return cfgPath
+}
+
 func TestLocalMSP(t *testing.T) {
-	testMSPConfigPath := utils.GetTESTMSPConfigPath()
+	testMSPConfigPath := getTestMSPConfigPath()
 	err := LoadLocalMsp(testMSPConfigPath)
 	if err != nil {
 		t.Fatalf("LoadLocalMsp failed, err %s", err)
@@ -40,7 +50,7 @@ func TestLocalMSP(t *testing.T) {
 
 // TODO: as soon as proper per-chain MSP support is developed, this test will no longer be required
 func TestFakeSetup(t *testing.T) {
-	testMSPConfigPath := utils.GetTESTMSPConfigPath()
+	testMSPConfigPath := getTestMSPConfigPath()
 	err := LoadFakeSetupWithLocalMspAndTestChainMsp(testMSPConfigPath)
 	if err != nil {
 		t.Fatalf("LoadLocalMsp failed, err %s", err)
@@ -62,7 +72,7 @@ func TestFakeSetup(t *testing.T) {
 }
 
 func TestGetMSPManagerFromBlock(t *testing.T) {
-	testMSPConfigPath := utils.GetTESTMSPConfigPath()
+	testMSPConfigPath := getTestMSPConfigPath()
 	conf, err := msp.GetLocalMspConfig(testMSPConfigPath)
 	if err != nil {
 		t.Fatalf("GetLocalMspConfig failed, err %s", err)

peer/channel/create.go

@@ -28,7 +28,6 @@ import (
 	"github.com/hyperledger/fabric/peer/common"
 	"github.com/hyperledger/fabric/peer/sharedconfig"
 	cb "github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -53,9 +52,9 @@ func sendCreateChainTransaction(cf *ChannelCmdFactory) error {
 	if err != nil {
 		return err
 	}
-	//TODO this is a temporary hack until `orderer.template` is supplied from the CLI
+	//TODO this is a temporary hack until `orderer.template` and 'msp.template' is supplied from the CLI
 	oTemplate := configtxtest.OrdererTemplate()
-	mspTemplate := configtx.NewSimpleTemplate(utils.EncodeMSPUnsigned(chainID))
+	mspTemplate := configtxtest.MSPTemplate()
 	gossTemplate := configtx.NewSimpleTemplate(sharedconfig.TemplateAnchorPeers(anchorPeers))
 	chCrtTemp := configtx.NewCompositeTemplate(oTemplate, mspTemplate, gossTemplate)
 

protos/utils/blockutils.go

@@ -18,12 +18,8 @@ package utils
 
 import (
 	"fmt"
-	"io/ioutil"
-	"os"
 
 	"github.com/golang/protobuf/proto"
-
-	"github.com/hyperledger/fabric/msp"
 	cb "github.com/hyperledger/fabric/protos/common"
 )
 
@@ -112,37 +108,3 @@ func InitBlockMetadata(block *cb.Block) {
 		}
 	}
 }
-
-const xxxDefaultModificationPolicyID = "DefaultModificationPolicy" // Break an import cycle during work to remove the below configtx construction methods
-
-// GetTESTMSPConfigPath This function is needed to locate the MSP test configuration when running
-// in CI build env or local with "make unit-test". A better way to manage this
-// is to define a config path in yaml that may point to test or production
-// location of the config
-func GetTESTMSPConfigPath() string {
-	cfgPath := os.Getenv("PEER_CFG_PATH") + "/msp/sampleconfig/"
-	if _, err := ioutil.ReadDir(cfgPath); err != nil {
-		cfgPath = os.Getenv("GOPATH") + "/src/github.com/hyperledger/fabric/msp/sampleconfig/"
-	}
-	return cfgPath
-}
-
-// EncodeMSPUnsigned gets the unsigned configuration item with the default MSP
-func EncodeMSPUnsigned(chainID string) *cb.ConfigurationItem {
-	cfgPath := GetTESTMSPConfigPath()
-	conf, err := msp.GetLocalMspConfig(cfgPath)
-	if err != nil {
-		panic(fmt.Sprintf("GetLocalMspConfig failed, err %s", err))
-	}
-	return &cb.ConfigurationItem{
-		Type:               cb.ConfigurationItem_MSP,
-		Key:                "DEFAULT", // XXX this should really be computed dynamically, but it's better than the old wrong "MSP"
-		Value:              MarshalOrPanic(conf),
-		ModificationPolicy: xxxDefaultModificationPolicyID,
-	}
-}
-
-// EncodeMSP gets the signed configuration item with the default MSP
-func EncodeMSP(chainID string) *cb.SignedConfigurationItem {
-	return &cb.SignedConfigurationItem{ConfigurationItem: MarshalOrPanic(EncodeMSPUnsigned(chainID))}
-}