Merge "[FAB-4999] Cleanup ChainSupport interface"

orderer/common/broadcast/broadcast.go

@@ -33,8 +33,7 @@ var logger = logging.MustGetLogger("orderer/common/broadcast")
 // ConfigUpdateProcessor is used to transform CONFIG_UPDATE transactions which are used to generate other envelope
 // message types with preprocessing by the orderer
 type ConfigUpdateProcessor interface {
-	// Process takes in an envelope of type CONFIG_UPDATE and proceses it
-	// to transform it either into another envelope type
+	// Process transforms an envelope of type CONFIG_UPDATE to another type
 	Process(envConfigUpdate *cb.Envelope) (*cb.Envelope, error)
 }
 

orderer/multichain/chainsupport.go

@@ -24,6 +24,7 @@ import (
 	"github.com/hyperledger/fabric/orderer/common/blockcutter"
 	"github.com/hyperledger/fabric/orderer/common/broadcast"
 	"github.com/hyperledger/fabric/orderer/common/configtxfilter"
+	"github.com/hyperledger/fabric/orderer/common/deliver"
 	"github.com/hyperledger/fabric/orderer/common/filter"
 	"github.com/hyperledger/fabric/orderer/common/sigfilter"
 	"github.com/hyperledger/fabric/orderer/common/sizefilter"
@@ -80,24 +81,10 @@ type ConsenterSupport interface {
 
 // ChainSupport provides a wrapper for the resources backing a chain
 type ChainSupport interface {
-	// This interface is actually the union with the deliver.Support but because of a golang
-	// limitation https://github.com/golang/go/issues/6977 the methods must be explicitly declared
-
-	// PolicyManager returns the current policy manager as specified by the chain config
-	PolicyManager() policies.Manager
-
-	// Reader returns the chain Reader for the chain
-	Reader() ledger.Reader
-
-	// Errored returns whether the backing consenter has errored
-	Errored() <-chan struct{}
-
 	broadcast.Support
+	deliver.Support
 	ConsenterSupport
 
-	// Sequence returns the current config sequence number
-	Sequence() uint64
-
 	// ProposeConfigUpdate applies a CONFIG_UPDATE to an existing config to produce a *cb.ConfigEnvelope
 	ProposeConfigUpdate(env *cb.Envelope) (*cb.ConfigEnvelope, error)
 }