gofmt, remove redundant test

m3db · Jul 20, 2018 · 7dd2a4f · 7dd2a4f
1 parent ca28735
commit 7dd2a4f
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 64 deletions.
diff --git a/consumer/config.go b/consumer/config.go
@@ -30,7 +30,7 @@ import (
 
 // Configuration configs the consumer options.
 type Configuration struct {
-	Encoder                   *proto.Configuration         `yaml:"encoder"`
+	Encoder                   *proto.Configuration          `yaml:"encoder"`
 	Decoder                   *proto.Configuration          `yaml:"decoder"`
 	MessagePool               *pool.ObjectPoolConfiguration `yaml:"messagePool"`
 	AckFlushInterval          *time.Duration                `yaml:"ackFlushInterval"`

diff --git a/consumer/options.go b/consumer/options.go
@@ -36,8 +36,8 @@ var (
 )
 
 type options struct {
-	encOptions		 proto.Options
-	decOptions		 proto.Options
+	encOptions       proto.Options
+	decOptions       proto.Options
 	messagePoolOpts  pool.ObjectPoolOptions
 	ackFlushInterval time.Duration
 	ackBufferSize    int
@@ -49,8 +49,8 @@ type options struct {
 // NewOptions creates a new options.
 func NewOptions() Options {
 	return &options{
-		encOptions:		  proto.NewOptions(),
-		decOptions:		  proto.NewOptions(),
+		encOptions:       proto.NewOptions(),
+		decOptions:       proto.NewOptions(),
 		messagePoolOpts:  pool.NewObjectPoolOptions(),
 		ackFlushInterval: defaultAckFlushInterval,
 		ackBufferSize:    defaultAckBufferSize,

diff --git a/consumer/types.go b/consumer/types.go
@@ -70,8 +70,8 @@ type Options interface {
 	EncoderOptions() proto.Options
 
 	// SetEncoderOptions sets the options for Encoder.
-	SetEncoderOptions(value proto.Options) Options	
-	
+	SetEncoderOptions(value proto.Options) Options
+
 	// DecoderOptions returns the options for Decoder.
 	DecoderOptions() proto.Options
 

diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -50,8 +50,8 @@ func TestSharedConsumer(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
-			consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
 		})
 
 		s.Run(t, ctrl)
@@ -71,7 +71,7 @@ func TestReplicatedConsumer(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
 		})
 
 		s.Run(t, ctrl)
@@ -92,9 +92,9 @@ func TestSharedAndReplicatedConsumers(t *testing.T) {
 	for i := 1; i <= maxProducers; i++ {
 		for j := 1; j <= maxRF; j++ {
 			s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-				consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
+				{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
 			})
 
 			s.Run(t, ctrl)
@@ -115,8 +115,8 @@ func TestSharedConsumerWithDeadInstance(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
-			consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -149,8 +149,8 @@ func TestSharedConsumerWithDeadConnection(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
-			consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -178,7 +178,7 @@ func TestReplicatedConsumerWithDeadConnection(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -207,9 +207,9 @@ func TestSharedAndReplicatedConsumerWithDeadConnection(t *testing.T) {
 	for i := 1; i <= maxProducers; i++ {
 		for j := 1; j <= maxRF; j++ {
 			s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-				consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
+				{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
 			})
 
 			s.ScheduleOperations(
@@ -246,8 +246,8 @@ func TestSharedConsumerAddInstances(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
-			consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -275,7 +275,7 @@ func TestReplicatedConsumerAddInstances(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -304,9 +304,9 @@ func TestSharedAndReplicatedConsumerAddInstances(t *testing.T) {
 	for i := 1; i <= maxProducers; i++ {
 		for j := 1; j <= maxRF; j++ {
 			s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-				consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
+				{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
 			})
 
 			s.ScheduleOperations(
@@ -343,8 +343,8 @@ func TestSharedConsumerRemoveInstances(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
-			consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -372,7 +372,7 @@ func TestReplicatedConsumerRemoveInstances(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -401,9 +401,9 @@ func TestSharedAndReplicatedConsumerRemoveInstances(t *testing.T) {
 	for i := 1; i <= maxProducers; i++ {
 		for j := 1; j <= maxRF; j++ {
 			s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-				consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
+				{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
 			})
 
 			s.ScheduleOperations(
@@ -440,8 +440,8 @@ func TestSharedConsumerReplaceInstances(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
-			consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: false, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -469,7 +469,7 @@ func TestReplicatedConsumerReplaceInstances(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -498,9 +498,9 @@ func TestSharedAndReplicatedConsumerReplaceInstances(t *testing.T) {
 	for i := 1; i <= maxProducers; i++ {
 		for j := 1; j <= maxRF; j++ {
 			s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-				consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
-				consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: true, instances: 5, replicas: j},
+				{ct: topic.Shared, isSharded: false, instances: 5, replicas: j},
+				{ct: topic.Replicated, isSharded: true, instances: 5, replicas: j},
 			})
 
 			s.ScheduleOperations(
@@ -537,9 +537,9 @@ func TestRemoveConsumerService(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
-			consumerServiceConfig{ct: topic.Shared, isSharded: false, instances: 1, replicas: 1},
-			consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: false, instances: 1, replicas: 1},
+			{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(
@@ -565,8 +565,8 @@ func TestAddConsumerService(t *testing.T) {
 
 	for i := 1; i <= maxProducers; i++ {
 		s := newTestSetup(t, ctrl, i, []consumerServiceConfig{
-			consumerServiceConfig{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
-			consumerServiceConfig{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Shared, isSharded: true, instances: 5, replicas: 2},
+			{ct: topic.Replicated, isSharded: true, instances: 5, replicas: 2},
 		})
 
 		s.ScheduleOperations(

diff --git a/producer/config/writer.go b/producer/config/writer.go
@@ -91,8 +91,8 @@ type WriterConfiguration struct {
 	InitialAckMapSize                 *int                           `yaml:"initialAckMapSize"`
 	CloseCheckInterval                *time.Duration                 `yaml:"closeCheckInterval"`
 	AckErrorRetry                     *retry.Configuration           `yaml:"ackErrorRetry"`
-	Encoder                     	  *proto.Configuration           `yaml:"encoder"`
-	Decoder                     	  *proto.Configuration           `yaml:"decoder"`
+	Encoder                           *proto.Configuration           `yaml:"encoder"`
+	Decoder                           *proto.Configuration           `yaml:"decoder"`
 	Connection                        *ConnectionConfiguration       `yaml:"connection"`
 }
 

diff --git a/producer/writer/options.go b/producer/writer/options.go
@@ -313,7 +313,7 @@ type Options interface {
 
 	// SetEncoderOptions sets the encoder's options.
 	SetEncoderOptions(value proto.Options) Options
-	
+
 	// EncoderOptions returns the decoder's options.
 	DecoderOptions() proto.Options
 
@@ -347,8 +347,8 @@ type writerOptions struct {
 	initialAckMapSize                 int
 	closeCheckInterval                time.Duration
 	ackErrRetryOpts                   retry.Options
-	encOpts							  proto.Options
-	decOpts						      proto.Options
+	encOpts                           proto.Options
+	decOpts                           proto.Options
 	cOpts                             ConnectionOptions
 	iOpts                             instrument.Options
 }
@@ -365,8 +365,8 @@ func NewOptions() Options {
 		initialAckMapSize:                 defaultInitialAckMapSize,
 		closeCheckInterval:                defaultCloseCheckInterval,
 		ackErrRetryOpts:                   retry.NewOptions(),
-		encOpts:						   proto.NewOptions(),
-		decOpts:						   proto.NewOptions(),
+		encOpts:                           proto.NewOptions(),
+		decOpts:                           proto.NewOptions(),
 		cOpts:                             NewConnectionOptions(),
 		iOpts:                             instrument.NewOptions(),
 	}

diff --git a/protocol/proto/config.go b/protocol/proto/config.go
@@ -27,12 +27,12 @@ import (
 
 // Configuration configures an Encoder or a Decoder.
 type Configuration struct {
-	MaxMessageSize    *int                              `yaml:"maxMessageSize"`
-	BytesPool         *pool.BucketizedPoolConfiguration `yaml:"bytesPool"`
+	MaxMessageSize *int                              `yaml:"maxMessageSize"`
+	BytesPool      *pool.BucketizedPoolConfiguration `yaml:"bytesPool"`
 }
 
 // NewOptions creates a new Options.
-func (c *Configuration) NewOptions (
+func (c *Configuration) NewOptions(
 	iOpts instrument.Options,
 ) Options {
 	var (
@@ -46,7 +46,7 @@ func (c *Configuration) NewOptions (
 		p := pool.NewBytesPool(
 			c.BytesPool.NewBuckets(),
 			c.BytesPool.NewObjectPoolOptions(iOpts.SetMetricsScope(scope.Tagged(
-			map[string]string{"pool": "bytes"},
+				map[string]string{"pool": "bytes"},
 			))),
 		)
 		p.Init()

diff --git a/protocol/proto/roundtrip_test.go b/protocol/proto/roundtrip_test.go
@@ -150,15 +150,6 @@ func TestDecodeMessageLargerThanMaxSize(t *testing.T) {
 	require.Contains(t, err.Error(), "larger than maximum supported size")
 }
 
-func TestDecodeReset(t *testing.T) {
-	dec := NewDecoder(nil, nil)
-	require.Nil(t, dec.(*decoder).r)
-
-	conn := new(net.TCPConn)
-	dec.ResetReader(conn)
-	require.Equal(t, conn, dec.(*decoder).r)
-}
-
 func TestEncodeDecodeRoundTrip(t *testing.T) {
 	enc := NewEncoder(nil)
 	dec := NewDecoder(nil, nil)