[FAB-2321] Cleanup channel config

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

The channel config values handling has been moved around a lot, this is
the first in a series of CRs designed to cleanup the style of the config
packages.

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

Author: Jason Yellick

common/configtx/api/api.go

@@ -17,7 +17,8 @@ limitations under the License.
 package api
 
 import (
-	configvalues "github.com/hyperledger/fabric/common/configvalues/api"
+	configvalues "github.com/hyperledger/fabric/common/configvalues"
+	configvalueschannel "github.com/hyperledger/fabric/common/configvalues/channel"
 	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/msp"
 	cb "github.com/hyperledger/fabric/protos/common"
@@ -51,7 +52,7 @@ type Resources interface {
 	PolicyManager() policies.Manager
 
 	// ChannelConfig returns the ChannelConfig for the chain
-	ChannelConfig() configvalues.Channel
+	ChannelConfig() configvalueschannel.ConfigReader
 
 	// OrdererConfig returns the configtxorderer.SharedConfig for the channel
 	OrdererConfig() configvalues.Orderer

common/configtx/config.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/fabric/common/configtx/api"
-	configvaluesapi "github.com/hyperledger/fabric/common/configvalues/api"
+	configvaluesapi "github.com/hyperledger/fabric/common/configvalues"
 	"github.com/hyperledger/fabric/common/policies"
 	cb "github.com/hyperledger/fabric/protos/common"
 )

common/configtx/initializer.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/hyperledger/fabric/common/cauthdsl"
 	"github.com/hyperledger/fabric/common/configtx/api"
-	configvaluesapi "github.com/hyperledger/fabric/common/configvalues/api"
-	configtxchannel "github.com/hyperledger/fabric/common/configvalues/channel"
+	configvaluesapi "github.com/hyperledger/fabric/common/configvalues"
+	configvalueschannel "github.com/hyperledger/fabric/common/configvalues/channel"
 	configtxapplication "github.com/hyperledger/fabric/common/configvalues/channel/application"
 	configtxorderer "github.com/hyperledger/fabric/common/configvalues/channel/orderer"
 	configtxmsp "github.com/hyperledger/fabric/common/configvalues/msp"
@@ -33,7 +33,7 @@ import (
 
 type resources struct {
 	policyManager     *policies.ManagerImpl
-	channelConfig     *configtxchannel.SharedConfigImpl
+	channelConfig     *configvalueschannel.Config
 	ordererConfig     *configtxorderer.ManagerImpl
 	applicationConfig *configtxapplication.SharedConfigImpl
 	mspConfigHandler  *configtxmsp.MSPConfigHandler
@@ -45,7 +45,7 @@ func (r *resources) PolicyManager() policies.Manager {
 }
 
 // ChannelConfig returns the api.ChannelConfig for the chain
-func (r *resources) ChannelConfig() configvaluesapi.Channel {
+func (r *resources) ChannelConfig() configvalueschannel.ConfigReader {
 	return r.channelConfig
 }
 
@@ -85,15 +85,15 @@ func newResources() *resources {
 
 	return &resources{
 		policyManager:     policies.NewManagerImpl(RootGroupKey, policyProviderMap),
-		channelConfig:     configtxchannel.NewSharedConfigImpl(ordererConfig, applicationConfig),
+		channelConfig:     configvalueschannel.NewConfig(ordererConfig, applicationConfig),
 		ordererConfig:     ordererConfig,
 		applicationConfig: applicationConfig,
 		mspConfigHandler:  mspConfigHandler,
 	}
 }
 
 type valueProposerRoot struct {
-	channelConfig    *configtxchannel.SharedConfigImpl
+	channelConfig    *configvalueschannel.Config
 	mspConfigHandler *configtxmsp.MSPConfigHandler
 }
 

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

@@ -24,20 +24,6 @@ import (
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
-// Channel stores the common channel config
-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
-}
-
 // Org stores the common organizational config
 type Org interface {
 	// Name returns the name this org is referred to in config

common/configvalues/channel/application/organization.go

@@ -19,7 +19,7 @@ package application
 import (
 	"fmt"
 
-	"github.com/hyperledger/fabric/common/configvalues/api"
+	"github.com/hyperledger/fabric/common/configvalues"
 	"github.com/hyperledger/fabric/common/configvalues/channel/common/organization"
 	mspconfig "github.com/hyperledger/fabric/common/configvalues/msp"
 	cb "github.com/hyperledger/fabric/protos/common"

common/configvalues/channel/application/organization_test.go

@@ -19,7 +19,7 @@ package application
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/common/configvalues/api"
+	api "github.com/hyperledger/fabric/common/configvalues"
 	cb "github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 

common/configvalues/channel/application/sharedconfig.go

@@ -17,7 +17,7 @@ limitations under the License.
 package application
 
 import (
-	"github.com/hyperledger/fabric/common/configvalues/api"
+	api "github.com/hyperledger/fabric/common/configvalues"
 	"github.com/hyperledger/fabric/common/configvalues/channel/common/organization"
 	"github.com/hyperledger/fabric/common/configvalues/msp"
 	cb "github.com/hyperledger/fabric/protos/common"

common/configvalues/channel/application/sharedconfig_test.go

@@ -19,7 +19,7 @@ package application
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/common/configvalues/api"
+	api "github.com/hyperledger/fabric/common/configvalues"
 
 	logging "github.com/op/go-logging"
 )

common/configvalues/channel/common/organization/organization.go

@@ -19,7 +19,7 @@ package organization
 import (
 	"fmt"
 
-	"github.com/hyperledger/fabric/common/configvalues/api"
+	"github.com/hyperledger/fabric/common/configvalues"
 	mspconfig "github.com/hyperledger/fabric/common/configvalues/msp"
 	"github.com/hyperledger/fabric/msp"
 	cb "github.com/hyperledger/fabric/protos/common"

common/configvalues/channel/common/organization/organization_test.go

@@ -19,7 +19,7 @@ package organization
 import (
 	"testing"
 
-	"github.com/hyperledger/fabric/common/configvalues/api"
+	api "github.com/hyperledger/fabric/common/configvalues"
 
 	logging "github.com/op/go-logging"
 )