Merge pull request #266 from peczenyj/small-fixes-and-refactors

Small fixes and refactors

_examples/client/client.go

@@ -180,7 +180,6 @@ func (client *Client) handleReconnect(addr string) {
 		client.infolog.Println("attempting to connect")
 
 		conn, err := client.connect(addr)
-
 		if err != nil {
 			client.errlog.Println("failed to connect. Retrying...")
 
@@ -201,7 +200,6 @@ func (client *Client) handleReconnect(addr string) {
 // connect will create a new AMQP connection
 func (client *Client) connect(addr string) (*amqp.Connection, error) {
 	conn, err := amqp.Dial(addr)
-
 	if err != nil {
 		return nil, err
 	}
@@ -220,7 +218,6 @@ func (client *Client) handleReInit(conn *amqp.Connection) bool {
 		client.m.Unlock()
 
 		err := client.init(conn)
-
 		if err != nil {
 			client.errlog.Println("failed to initialize channel, retrying...")
 
@@ -250,13 +247,11 @@ func (client *Client) handleReInit(conn *amqp.Connection) bool {
 // init will initialize channel & declare queue
 func (client *Client) init(conn *amqp.Connection) error {
 	ch, err := conn.Channel()
-
 	if err != nil {
 		return err
 	}
 
 	err = ch.Confirm(false)
-
 	if err != nil {
 		return err
 	}
@@ -268,7 +263,6 @@ func (client *Client) init(conn *amqp.Connection) error {
 		false, // No-wait
 		nil,   // Arguments
 	)
-
 	if err != nil {
 		return err
 	}

_examples/producer/producer.go

@@ -5,12 +5,13 @@ package main
 
 import (
 	"flag"
-	amqp "github.com/rabbitmq/amqp091-go"
 	"log"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
+
+	amqp "github.com/rabbitmq/amqp091-go"
 )
 
 var (

_examples/pubsub/pubsub.go

@@ -12,10 +12,11 @@ import (
 	"crypto/sha1"
 	"flag"
 	"fmt"
-	amqp "github.com/rabbitmq/amqp091-go"
 	"io"
 	"log"
 	"os"
+
+	amqp "github.com/rabbitmq/amqp091-go"
 )
 
 var url = flag.String("url", "amqp:///", "AMQP url for both the publisher and subscriber")

allocator_test.go

@@ -95,7 +95,6 @@ func TestAllocatorShouldNotReuseEarly(t *testing.T) {
 	if want, got := first, third; want != got {
 		t.Fatalf("expected third allocation to be %d, got: %d", want, got)
 	}
-
 }
 
 func TestAllocatorReleasesKeepUpWithAllocationsForAllSizes(t *testing.T) {

auth.go

@@ -55,8 +55,7 @@ func (auth *AMQPlainAuth) Response() string {
 }
 
 // ExternalAuth for RabbitMQ-auth-mechanism-ssl.
-type ExternalAuth struct {
-}
+type ExternalAuth struct{}
 
 // Mechanism returns "EXTERNAL"
 func (*ExternalAuth) Mechanism() string {
@@ -70,7 +69,6 @@ func (*ExternalAuth) Response() string {
 
 // Finds the first mechanism preferred by the client that the server supports.
 func pickSASLMechanism(client []Authentication, serverMechanisms []string) (auth Authentication, ok bool) {
-
 	for _, auth = range client {
 		for _, mech := range serverMechanisms {
 			if auth.Mechanism() == mech {

channel.go

@@ -1790,7 +1790,7 @@ it must be redelivered or dropped.
 
 See also Delivery.Nack
 */
-func (ch *Channel) Nack(tag uint64, multiple bool, requeue bool) error {
+func (ch *Channel) Nack(tag uint64, multiple, requeue bool) error {
 	ch.m.Lock()
 	defer ch.m.Unlock()
 

client_test.go

@@ -26,10 +26,12 @@ type server struct {
 	tune  connectionTuneOk
 }
 
-var defaultLogin = "guest"
-var defaultPassword = "guest"
-var defaultPlainAuth = &PlainAuth{defaultLogin, defaultPassword}
-var defaultAMQPlainAuth = &AMQPlainAuth{defaultLogin, defaultPassword}
+var (
+	defaultLogin        = "guest"
+	defaultPassword     = "guest"
+	defaultPlainAuth    = &PlainAuth{defaultLogin, defaultPassword}
+	defaultAMQPlainAuth = &AMQPlainAuth{defaultLogin, defaultPassword}
+)
 
 func defaultConfigWithAuth(auth Authentication) Config {
 	return Config{
@@ -48,6 +50,8 @@ func amqplainConfig() Config {
 }
 
 func newServer(t *testing.T, serverIO, clientIO io.ReadWriteCloser) *server {
+	t.Helper()
+
 	return &server{
 		T: t,
 		r: reader{serverIO},
@@ -58,6 +62,8 @@ func newServer(t *testing.T, serverIO, clientIO io.ReadWriteCloser) *server {
 }
 
 func newSession(t *testing.T) (io.ReadWriteCloser, *server) {
+	t.Helper()
+
 	rs, wc := io.Pipe()
 	rc, ws := io.Pipe()
 
@@ -228,7 +234,6 @@ func TestDefaultClientProperties(t *testing.T) {
 
 	go func() {
 		srv.connectionOpen()
-
 	}()
 
 	if c, err := Open(rwc, defaultConfig()); err != nil {
@@ -246,7 +251,6 @@ func TestDefaultClientProperties(t *testing.T) {
 	if want, got := defaultLocale, srv.start.Locale; want != got {
 		t.Errorf("expected locale %s got: %s", want, got)
 	}
-
 }
 
 func TestCustomClientProperties(t *testing.T) {
@@ -261,7 +265,6 @@ func TestCustomClientProperties(t *testing.T) {
 
 	go func() {
 		srv.connectionOpen()
-
 	}()
 
 	if c, err := Open(rwc, config); err != nil {
@@ -275,15 +278,13 @@ func TestCustomClientProperties(t *testing.T) {
 	if want, got := config.Properties["version"], srv.start.ClientProperties["version"]; want != got {
 		t.Errorf("expected version %s got: %s", want, got)
 	}
-
 }
 
 func TestOpen(t *testing.T) {
 	rwc, srv := newSession(t)
 	t.Cleanup(func() { rwc.Close() })
 	go func() {
 		srv.connectionOpen()
-
 	}()
 
 	if c, err := Open(rwc, defaultConfig()); err != nil {
@@ -333,7 +334,6 @@ func TestChannelOpen(t *testing.T) {
 	go func() {
 		srv.connectionOpen()
 		srv.channelOpen(1)
-
 	}()
 
 	c, err := Open(rwc, defaultConfig())
@@ -345,7 +345,6 @@ func TestChannelOpen(t *testing.T) {
 	if err != nil {
 		t.Fatalf("could not open channel: %v (%s)", ch, err)
 	}
-
 }
 
 func TestOpenFailedSASLUnsupportedMechanisms(t *testing.T) {
@@ -361,7 +360,6 @@ func TestOpenFailedSASLUnsupportedMechanisms(t *testing.T) {
 	if err != ErrSASL {
 		t.Fatalf("expected ErrSASL got: %+v on %+v", err, c)
 	}
-
 }
 
 func TestOpenAMQPlainAuth(t *testing.T) {
@@ -393,7 +391,6 @@ func TestOpenAMQPlainAuth(t *testing.T) {
 	if table["PASSWORD"] != defaultPassword {
 		t.Fatalf("unexpected password: want: %s, got: %s", defaultPassword, table["PASSWORD"])
 	}
-
 }
 
 func TestOpenFailedCredentials(t *testing.T) {
@@ -410,7 +407,6 @@ func TestOpenFailedCredentials(t *testing.T) {
 	if err != ErrCredentials {
 		t.Fatalf("expected ErrCredentials got: %+v on %+v", err, c)
 	}
-
 }
 
 func TestOpenFailedVhost(t *testing.T) {
@@ -527,7 +523,6 @@ func TestConfirmMultipleOrdersDeliveryTags(t *testing.T) {
 			t.Fatalf("failed ack, expected ack#%d to be %d, got %d", i, tag, ack.DeliveryTag)
 		}
 	}
-
 }
 
 func TestDeferredConfirmations(t *testing.T) {

connection.go

@@ -675,7 +675,6 @@ func (c *Connection) dispatch0(f frame) {
 				return
 			case c.rpc <- m:
 			}
-
 		}
 	case *heartbeatFrame:
 		// kthx - all reads reset our deadline.  so we can drop this
@@ -755,7 +754,6 @@ func (c *Connection) reader(r io.Reader) {
 
 	for {
 		frame, err := frames.ReadFrame()
-
 		if err != nil {
 			c.shutdown(&Error{Code: FrameError, Reason: err.Error()})
 			return

connection_test.go

@@ -375,6 +375,8 @@ func TestConnection_Close_WhenMemoryAlarmIsActive(t *testing.T) {
 }
 
 func rabbitmqctl(t *testing.T, args ...string) error {
+	t.Helper()
+
 	rabbitmqctlPath, found := os.LookupEnv(rabbitmqctlEnvKey)
 	if !found {
 		t.Skipf("variable for %s for rabbitmqctl not found, skipping", rabbitmqctlEnvKey)

consumers.go

@@ -55,7 +55,7 @@ func (subs *consumers) buffer(in chan *Delivery, out chan Delivery) {
 	defer close(out)
 	defer subs.Done()
 
-	var inflight = in
+	inflight := in
 	var queue []*Delivery
 
 	for delivery := range in {

delivery.go

@@ -18,7 +18,7 @@ var errDeliveryNotInitialized = errors.New("delivery not initialized")
 // Applications can provide mock implementations in tests of Delivery handlers.
 type Acknowledger interface {
 	Ack(tag uint64, multiple bool) error
-	Nack(tag uint64, multiple bool, requeue bool) error
+	Nack(tag uint64, multiple, requeue bool) error
 	Reject(tag uint64, requeue bool) error
 }
 

example_client_test.go

@@ -174,7 +174,6 @@ func (client *Client) handleReconnect(addr string) {
 		client.logger.Println("Attempting to connect")
 
 		conn, err := client.connect(addr)
-
 		if err != nil {
 			client.logger.Println("Failed to connect. Retrying...")
 
@@ -195,7 +194,6 @@ func (client *Client) handleReconnect(addr string) {
 // connect will create a new AMQP connection
 func (client *Client) connect(addr string) (*amqp.Connection, error) {
 	conn, err := amqp.Dial(addr)
-
 	if err != nil {
 		return nil, err
 	}
@@ -214,7 +212,6 @@ func (client *Client) handleReInit(conn *amqp.Connection) bool {
 		client.m.Unlock()
 
 		err := client.init(conn)
-
 		if err != nil {
 			client.logger.Println("Failed to initialize channel. Retrying...")
 
@@ -244,13 +241,11 @@ func (client *Client) handleReInit(conn *amqp.Connection) bool {
 // init will initialize channel & declare queue
 func (client *Client) init(conn *amqp.Connection) error {
 	ch, err := conn.Channel()
-
 	if err != nil {
 		return err
 	}
 
 	err = ch.Confirm(false)
-
 	if err != nil {
 		return err
 	}
@@ -262,7 +257,6 @@ func (client *Client) init(conn *amqp.Connection) error {
 		false, // No-wait
 		nil,   // Arguments
 	)
-
 	if err != nil {
 		return err
 	}

examples_test.go

@@ -202,7 +202,6 @@ func ExampleChannel_Confirm_bridge() {
 			// And the body
 			Body: msg.Body,
 		})
-
 		if err != nil {
 			if e := msg.Nack(false, false); e != nil {
 				log.Printf("nack error: %+v", e)