Move configfilter to configtx package

The broadcastfilter package had a subpackage called configfilter.  This
was wrong for a number of reasons.  First off, the package name
stuttered, and secondly it does not filter configuration, rather, it
filters configuration transactions.  Finally, because of the close
dependency on the configtx package, it is natural to group the two
together.

This move is meant to serve as a prelude to introducing a multichain
broadcastfilter which will live within the multichain package.

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

Author: Jason Yellick

orderer/common/broadcastfilter/configfilter/configfilter.go orderer/common/configtx/filter.go

@@ -14,22 +14,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package configfilter
+package configtx
 
 import (
 	"github.com/hyperledger/fabric/orderer/common/broadcastfilter"
-	"github.com/hyperledger/fabric/orderer/common/configtx"
 	cb "github.com/hyperledger/fabric/protos/common"
 
 	"github.com/golang/protobuf/proto"
 )
 
 type configFilter struct {
-	configManager configtx.Manager
+	configManager Manager
 }
 
-// New creates a new configfilter Rule based on the given configtx.Manager
-func New(manager configtx.Manager) broadcastfilter.Rule {
+// New creates a new configfilter Rule based on the given Manager
+func NewFilter(manager Manager) broadcastfilter.Rule {
 	return &configFilter{
 		configManager: manager,
 	}

orderer/common/broadcastfilter/configfilter/configfilter_test.go orderer/common/configtx/filter_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package configfilter
+package configtx
 
 import (
 	"fmt"
@@ -43,7 +43,7 @@ func (mcm *mockConfigManager) ChainID() string {
 }
 
 func TestForwardNonConfig(t *testing.T) {
-	cf := New(&mockConfigManager{})
+	cf := NewFilter(&mockConfigManager{})
 	result := cf.Apply(&cb.Envelope{
 		Payload: []byte("Opaque"),
 	})
@@ -53,7 +53,7 @@ func TestForwardNonConfig(t *testing.T) {
 }
 
 func TestAcceptGoodConfig(t *testing.T) {
-	cf := New(&mockConfigManager{})
+	cf := NewFilter(&mockConfigManager{})
 	config, _ := proto.Marshal(&cb.ConfigurationEnvelope{})
 	configBytes, _ := proto.Marshal(&cb.Payload{Header: &cb.Header{ChainHeader: &cb.ChainHeader{Type: int32(cb.HeaderType_CONFIGURATION_TRANSACTION)}}, Data: config})
 	result := cf.Apply(&cb.Envelope{
@@ -65,7 +65,7 @@ func TestAcceptGoodConfig(t *testing.T) {
 }
 
 func TestRejectBadConfig(t *testing.T) {
-	cf := New(&mockConfigManager{err: fmt.Errorf("Error")})
+	cf := NewFilter(&mockConfigManager{err: fmt.Errorf("Error")})
 	config, _ := proto.Marshal(&cb.ConfigurationEnvelope{})
 	configBytes, _ := proto.Marshal(&cb.Payload{Header: &cb.Header{ChainHeader: &cb.ChainHeader{Type: int32(cb.HeaderType_CONFIGURATION_TRANSACTION)}}, Data: config})
 	result := cf.Apply(&cb.Envelope{

orderer/common/configtx/configtx.go orderer/common/configtx/manager.go

@@ -20,7 +20,6 @@ import (
 	"github.com/hyperledger/fabric/orderer/common/blockcutter"
 	"github.com/hyperledger/fabric/orderer/common/broadcast"
 	"github.com/hyperledger/fabric/orderer/common/broadcastfilter"
-	"github.com/hyperledger/fabric/orderer/common/broadcastfilter/configfilter"
 	"github.com/hyperledger/fabric/orderer/common/configtx"
 	"github.com/hyperledger/fabric/orderer/common/deliver"
 	"github.com/hyperledger/fabric/orderer/common/policies"
@@ -115,7 +114,7 @@ func newChainSupport(configManager configtx.Manager, policyManager policies.Mana
 func createBroadcastRuleset(configManager configtx.Manager) *broadcastfilter.RuleSet {
 	return broadcastfilter.NewRuleSet([]broadcastfilter.Rule{
 		broadcastfilter.EmptyRejectRule,
-		configfilter.New(configManager),
+		configtx.NewFilter(configManager),
 		broadcastfilter.AcceptRule,
 	})
 }