Tidy up some peer channel create code

Change-Id: I2066d2ce5260ebf58798aaac12758eca57375685
Signed-off-by: Yacov Manevich <[email protected]>

Author: yacovm

common/configtx/template.go

@@ -17,16 +17,15 @@ limitations under the License.
 package configtx
 
 import (
+	"fmt"
+
+	"github.com/golang/protobuf/proto"
 	configtxorderer "github.com/hyperledger/fabric/common/configvalues/channel/orderer"
 	"github.com/hyperledger/fabric/common/util"
+	"github.com/hyperledger/fabric/msp"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric/protos/utils"
-
-	"fmt"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/msp"
 )
 
 const (

peer/channel/create.go

@@ -60,11 +60,7 @@ func createCmd(cf *ChannelCmdFactory) *cobra.Command {
 }
 
 func createChannelFromDefaults(cf *ChannelCmdFactory) (*cb.Envelope, error) {
-	oTemplate := configtxtest.OrdererTemplate()
-	oOrgTemplate := configtxtest.OrdererOrgTemplate()
-	appOrgTemplate := configtxtest.ApplicationOrgTemplate()
-
-	chCrtTemp := configtx.NewCompositeTemplate(oTemplate, oOrgTemplate, appOrgTemplate)
+	chCrtTemp := configtxtest.CompositeTemplate()
 
 	signer, err := mspmgmt.GetLocalMSP().GetDefaultSigningIdentity()
 	if err != nil {