[FAB-2526] Move consolidate config to one package

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

This CR consolidates config from fabric/common/configvalues/root and
fabric/common/configvalues to be in fabric/common/config.

This completes the refactoring of the config needed to support config
inspection which will follow in subsequent changesets.

Change-Id: I081547be49abc3d0839f0b3accd01d378f36bf81
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

Author: Jason Yellick

common/configvalues/api.go renamed to common/config/api.go

@@ -49,6 +49,20 @@ type Application interface {
 	Organizations() map[string]ApplicationOrg
 }
 
+// Channel gives read only access to the channel configuration
+type Channel interface {
+	// HashingAlgorithm returns the default algorithm to be used when hashing
+	// such as computing block hashes, and CreationPolicy digests
+	HashingAlgorithm() func(input []byte) []byte
+
+	// BlockDataHashingStructureWidth returns the width to use when constructing the
+	// Merkle tree to compute the BlockData hash
+	BlockDataHashingStructureWidth() uint32
+
+	// OrdererAddresses returns the list of valid orderer addresses to connect to to invoke Broadcast/Deliver
+	OrdererAddresses() []string
+}
+
 // Orderer stores the common shared orderer config
 type Orderer interface {
 	// ConsensusType returns the configured consensus type

common/configvalues/root/application.go renamed to common/config/application.go

@@ -19,8 +19,7 @@ package config
 import (
 	"fmt"
 
-	api "github.com/hyperledger/fabric/common/configvalues"
-	"github.com/hyperledger/fabric/common/configvalues/msp"
+	"github.com/hyperledger/fabric/common/config/msp"
 )
 
 const (
@@ -39,7 +38,7 @@ type ApplicationConfig struct {
 	*standardValues
 
 	applicationGroup *ApplicationGroup
-	applicationOrgs  map[string]api.ApplicationOrg
+	applicationOrgs  map[string]ApplicationOrg
 }
 
 // NewSharedConfigImpl creates a new SharedConfigImpl with the given CryptoHelper
@@ -52,7 +51,7 @@ func NewApplicationGroup(mspConfig *msp.MSPConfigHandler) *ApplicationGroup {
 	return ag
 }
 
-func (ag *ApplicationGroup) NewGroup(name string) (api.ValueProposer, error) {
+func (ag *ApplicationGroup) NewGroup(name string) (ValueProposer, error) {
 	return NewApplicationOrgGroup(name, ag.mspConfig), nil
 }
 
@@ -75,8 +74,8 @@ func NewApplicationConfig(ag *ApplicationGroup) *ApplicationConfig {
 	}
 }
 
-func (ac *ApplicationConfig) Validate(groups map[string]api.ValueProposer) error {
-	ac.applicationOrgs = make(map[string]api.ApplicationOrg)
+func (ac *ApplicationConfig) Validate(groups map[string]ValueProposer) error {
+	ac.applicationOrgs = make(map[string]ApplicationOrg)
 	var ok bool
 	for key, value := range groups {
 		ac.applicationOrgs[key], ok = value.(*ApplicationOrgGroup)
@@ -92,6 +91,6 @@ func (ac *ApplicationConfig) Commit() {
 }
 
 // Organizations returns a map of org ID to ApplicationOrg
-func (ac *ApplicationConfig) Organizations() map[string]api.ApplicationOrg {
+func (ac *ApplicationConfig) Organizations() map[string]ApplicationOrg {
 	return ac.applicationOrgs
 }

common/configvalues/root/application_test.go renamed to common/config/application_test.go

@@ -19,8 +19,6 @@ package config
 import (
 	"testing"
 
-	api "github.com/hyperledger/fabric/common/configvalues"
-
 	logging "github.com/op/go-logging"
 )
 
@@ -29,5 +27,5 @@ func init() {
 }
 
 func TestApplicationInterface(t *testing.T) {
-	_ = api.Application((*ApplicationGroup)(nil))
+	_ = Application((*ApplicationGroup)(nil))
 }

common/configvalues/root/application_util.go renamed to common/config/application_util.go

@@ -17,8 +17,7 @@ limitations under the License.
 package config
 
 import (
-	api "github.com/hyperledger/fabric/common/configvalues"
-	mspconfig "github.com/hyperledger/fabric/common/configvalues/msp"
+	mspconfig "github.com/hyperledger/fabric/common/config/msp"
 	pb "github.com/hyperledger/fabric/protos/peer"
 
 	logging "github.com/op/go-logging"
@@ -87,7 +86,7 @@ func NewApplicationOrgConfig(aog *ApplicationOrgGroup) *ApplicationOrgConfig {
 	return aoc
 }
 
-func (aoc *ApplicationOrgConfig) Validate(groups map[string]api.ValueProposer) error {
+func (aoc *ApplicationOrgConfig) Validate(groups map[string]ValueProposer) error {
 	if logger.IsEnabledFor(logging.DEBUG) {
 		logger.Debugf("Anchor peers for org %s are %v", aoc.applicationOrgGroup.name, aoc.protos.AnchorPeers)
 	}

common/configvalues/root/applicationorg.go renamed to common/config/applicationorg.go

@@ -18,10 +18,8 @@ package config
 
 import (
 	"testing"
-
-	api "github.com/hyperledger/fabric/common/configvalues"
 )
 
 func TestApplicationOrgInterface(t *testing.T) {
-	_ = api.ValueProposer(NewApplicationOrgGroup("id", nil))
+	_ = ValueProposer(NewApplicationOrgGroup("id", nil))
 }

common/configvalues/root/applicationorg_test.go renamed to common/config/applicationorg_test.go

@@ -21,8 +21,7 @@ import (
 	"math"
 
 	"github.com/hyperledger/fabric/bccsp"
-	api "github.com/hyperledger/fabric/common/configvalues"
-	"github.com/hyperledger/fabric/common/configvalues/msp"
+	"github.com/hyperledger/fabric/common/config/msp"
 	"github.com/hyperledger/fabric/common/util"
 	cb "github.com/hyperledger/fabric/protos/common"
 )
@@ -107,7 +106,7 @@ func (cg *ChannelGroup) ApplicationConfig() *ApplicationGroup {
 }
 
 // NewGroup instantiates either a new application or orderer config
-func (cg *ChannelGroup) NewGroup(group string) (api.ValueProposer, error) {
+func (cg *ChannelGroup) NewGroup(group string) (ValueProposer, error) {
 	switch group {
 	case ApplicationGroupKey:
 		return NewApplicationGroup(cg.mspConfigHandler), nil
@@ -160,7 +159,7 @@ func (cc *ChannelConfig) OrdererAddresses() []string {
 
 // Validate inspects the generated configuration protos, ensures that the values are correct, and
 // sets the ChannelConfig fields that may be referenced after Commit
-func (cc *ChannelConfig) Validate(groups map[string]api.ValueProposer) error {
+func (cc *ChannelConfig) Validate(groups map[string]ValueProposer) error {
 	for _, validator := range []func() error{
 		cc.validateHashingAlgorithm,
 		cc.validateBlockDataHashingStructure,

common/configvalues/root/channel.go renamed to common/config/channel.go

@@ -32,7 +32,7 @@ func init() {
 }
 
 func TestInterface(t *testing.T) {
-	_ = ChannelValues(NewChannelGroup(nil))
+	_ = Channel(NewChannelGroup(nil))
 }
 
 func TestHashingAlgorithm(t *testing.T) {