[FAB-4621] Modify channel names in tests

With FAB-2487 in, uppercase characters are no longer allowed in channel
names. This doesn't affect the channel names we use in our tests since
they do not go through the validate function that was modified in
FAB-2487, but we should give them valid names nonetheless for
consistency.

This changeset does the necessary modifications.

Change-Id: Id3d02138b5c767ad1fd560e387caaadd6bafa2d6
Signed-off-by: Kostas Christidis <kostas@christidis.io>

orderer/kafka/chain_test.go

@@ -31,7 +31,7 @@ var (
 )
 
 func TestChain(t *testing.T) {
-	mockChannel := newChannel("channelFoo", defaultPartition)
+	mockChannel := newChannel("foo.channel", defaultPartition)
 
 	oldestOffset := int64(0)
 	newestOffset := int64(5)
@@ -334,7 +334,7 @@ func TestSetupProducerForChannel(t *testing.T) {
 	mockBroker := sarama.NewMockBroker(t, 0)
 	defer mockBroker.Close()
 
-	mockChannel := newChannel("channelFoo", defaultPartition)
+	mockChannel := newChannel("foo.channel", defaultPartition)
 
 	haltChan := make(chan struct{})
 
@@ -359,7 +359,7 @@ func TestSetupConsumerForChannel(t *testing.T) {
 	mockBroker := sarama.NewMockBroker(t, 0)
 	defer func() { mockBroker.Close() }()
 
-	mockChannel := newChannel("channelFoo", defaultPartition)
+	mockChannel := newChannel("foo.channel", defaultPartition)
 
 	oldestOffset := int64(0)
 	newestOffset := int64(5)
@@ -410,7 +410,7 @@ func TestSetupConsumerForChannel(t *testing.T) {
 }
 
 func TestCloseKafkaObjects(t *testing.T) {
-	mockChannel := newChannel("channelFoo", defaultPartition)
+	mockChannel := newChannel("foo.channel", defaultPartition)
 
 	mockSupport := &mockmultichain.ConsenterSupport{
 		ChainIDVal: mockChannel.topic(),
@@ -524,7 +524,7 @@ func TestGetLastCutBlockNumber(t *testing.T) {
 }
 
 func TestGetLastOffsetPersisted(t *testing.T) {
-	mockChannel := newChannel("channelFoo", defaultPartition)
+	mockChannel := newChannel("foo.channel", defaultPartition)
 	mockMetadata := &cb.Metadata{Value: utils.MarshalOrPanic(&ab.KafkaMetadata{LastOffsetPersisted: int64(5)})}
 
 	testCases := []struct {

orderer/kafka/channel_test.go

@@ -24,9 +24,9 @@ import (
 )
 
 func TestChannel(t *testing.T) {
-	chn := newChannel("channelFoo", defaultPartition)
+	chn := newChannel("foo.channel", defaultPartition)
 
-	expectedTopic := fmt.Sprintf("%s", "channelFoo")
+	expectedTopic := fmt.Sprintf("%s", "foo.channel")
 	actualTopic := chn.topic()
 	assert.Equal(t, expectedTopic, actualTopic, "Got the wrong topic, expected %s, got %s instead", expectedTopic, actualTopic)
 

orderer/kafka/config_test.go

@@ -17,10 +17,10 @@ import (
 )
 
 func TestBrokerConfig(t *testing.T) {
-	mockChannel1 := newChannel("channelFoo", defaultPartition)
+	mockChannel1 := newChannel("foo.channel", defaultPartition)
 	// Use a partition ID that is not the 'default' (defaultPartition)
 	var differentPartition int32 = defaultPartition + 1
-	mockChannel2 := newChannel("channelFoo", differentPartition)
+	mockChannel2 := newChannel("foo.channel", differentPartition)
 
 	mockBroker := sarama.NewMockBroker(t, 0)
 	defer func() { mockBroker.Close() }()

orderer/kafka/consenter_test.go

@@ -67,7 +67,7 @@ func TestHandleChain(t *testing.T) {
 	newestOffset := int64(5)
 	message := sarama.StringEncoder("messageFoo")
 
-	mockChannel := newChannel("channelFoo", defaultPartition)
+	mockChannel := newChannel("foo.channel", defaultPartition)
 
 	mockBroker := sarama.NewMockBroker(t, 0)
 	mockBroker.SetHandlerByMap(map[string]sarama.MockResponse{
@@ -113,7 +113,6 @@ func extractEncodedOffset(marshalledOrdererMetadata []byte) int64 {
 func newMockBrokerConfig(tlsConfig localconfig.TLS, retryOptions localconfig.Retry, kafkaVersion sarama.KafkaVersion, chosenStaticPartition int32) *sarama.Config {
 	brokerConfig := newBrokerConfig(tlsConfig, retryOptions, kafkaVersion, chosenStaticPartition)
 	brokerConfig.ClientID = "test"
-	brokerConfig.Producer.MaxMessageBytes-- // FIXME https://jira.hyperledger.org/browse/FAB-4083
 	return brokerConfig
 }
 

orderer/kafka/partitioner_test.go

@@ -18,7 +18,7 @@ func TestStaticPartitioner(t *testing.T) {
 	var numberOfPartitions int32 = 6
 
 	partitionerConstructor := newStaticPartitioner(partition)
-	partitioner := partitionerConstructor("channelFoo")
+	partitioner := partitionerConstructor("foo.channel")
 
 	for i := 0; i < 10; i++ {
 		assignedPartition, err := partitioner.Partition(new(sarama.ProducerMessage), numberOfPartitions)

orderer/kafka/retry_test.go

@@ -16,7 +16,7 @@ import (
 func TestRetry(t *testing.T) {
 	var rp *retryProcess
 
-	mockChannel := newChannel("channelFoo", defaultPartition)
+	mockChannel := newChannel("foo.channel", defaultPartition)
 	flag := false
 
 	noErrorFn := func() error {