format source tree using goimports

rpc/versionhandshake/versionhandshake.go

@@ -17,7 +17,7 @@ import (
 
 type HandshakeMessage struct {
 	ProtocolVersion int
-	Extensions []string
+	Extensions      []string
 }
 
 // A HandshakeError describes what went wrong during the handshake.
@@ -25,7 +25,7 @@ type HandshakeMessage struct {
 type HandshakeError struct {
 	msg string
 	// If not nil, the underlying IO error that caused the handshake to fail.
-	IOError error
+	IOError       error
 	isAcceptError bool
 }
 
@@ -36,10 +36,10 @@ func (e HandshakeError) Error() string { return e.msg }
 // Like with net.OpErr (Go issue 6163), a client failing to handshake
 // should be a temporary Accept error toward the Listener .
 func (e HandshakeError) Temporary() bool {
-	if  e.isAcceptError {
+	if e.isAcceptError {
 		return true
 	}
-	te, ok := e.IOError.(interface{ Temporary() bool });
+	te, ok := e.IOError.(interface{ Temporary() bool })
 	return ok && te.Temporary()
 }
 
@@ -52,11 +52,11 @@ func (e HandshakeError) Timeout() bool {
 	return false
 }
 
-func hsErr(format string, args... interface{}) *HandshakeError {
+func hsErr(format string, args ...interface{}) *HandshakeError {
 	return &HandshakeError{msg: fmt.Sprintf(format, args...)}
 }
 
-func hsIOErr(err error, format string, args... interface{}) *HandshakeError {
+func hsIOErr(err error, format string, args ...interface{}) *HandshakeError {
 	return &HandshakeError{IOError: err, msg: fmt.Sprintf(format, args...)}
 }
 
@@ -145,7 +145,7 @@ func (m *HandshakeMessage) DecodeReader(r io.Reader, maxLen int) error {
 	if exts[len(exts)-1] != "" {
 		return hsErr("unexpected data trailing after last extension newline")
 	}
-	m.Extensions = exts[0:len(exts)-1]
+	m.Extensions = exts[0 : len(exts)-1]
 
 	return nil
 }
@@ -160,7 +160,7 @@ const HandshakeMessageMaxLen = 16 * 4096
 func DoHandshakeVersion(conn net.Conn, deadline time.Time, version int) *HandshakeError {
 	ours := HandshakeMessage{
 		ProtocolVersion: version,
-		Extensions: nil,
+		Extensions:      nil,
 	}
 	hsb, err := ours.Encode()
 	if err != nil {

rpc/versionhandshake/versionhandshake_test.go

@@ -3,13 +3,15 @@ package versionhandshake
 import (
 	"bytes"
 	"fmt"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/zrepl/zrepl/util/socketpair"
 	"io"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/zrepl/zrepl/util/socketpair"
 )
 
 func TestHandshakeMessage_Encode(t *testing.T) {
@@ -23,8 +25,6 @@ func TestHandshakeMessage_Encode(t *testing.T) {
 	enc := string(encB)
 	t.Logf("enc: %s", enc)
 
-
-
 	assert.False(t, strings.ContainsAny(enc[0:10], " "))
 	assert.True(t, enc[10] == ' ')
 
@@ -45,7 +45,7 @@ func TestHandshakeMessage_Encode(t *testing.T) {
 
 func TestHandshakeMessage_Encode_InvalidProtocolVersion(t *testing.T) {
 
-	for _, pv := range []int{-1, 0,  10000, 10001} {
+	for _, pv := range []int{-1, 0, 10000, 10001} {
 		t.Logf("testing invalid protocol version = %v", pv)
 		msg := HandshakeMessage{
 			ProtocolVersion: pv,
@@ -68,7 +68,7 @@ func TestHandshakeMessage_DecodeReader(t *testing.T) {
 	require.NoError(t, err)
 
 	out := HandshakeMessage{}
-	err = out.DecodeReader(bytes.NewReader([]byte(enc)), 4 * 4096)
+	err = out.DecodeReader(bytes.NewReader([]byte(enc)), 4*4096)
 	assert.NoError(t, err)
 	assert.Equal(t, 2342, out.ProtocolVersion)
 	assert.Equal(t, 2, len(out.Extensions))

rpc/versionhandshake/versionhandshake_transport_wrappers.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"net"
 	"time"
+
 	"github.com/zrepl/zrepl/transport"
 )
 
 type HandshakeConnecter struct {
 	connecter transport.Connecter
-	timeout time.Duration
+	timeout   time.Duration
 }
 
 func (c HandshakeConnecter) Connect(ctx context.Context) (transport.Wire, error) {
@@ -31,17 +32,17 @@ func (c HandshakeConnecter) Connect(ctx context.Context) (transport.Wire, error)
 func Connecter(connecter transport.Connecter, timeout time.Duration) HandshakeConnecter {
 	return HandshakeConnecter{
 		connecter: connecter,
-		timeout: timeout,
+		timeout:   timeout,
 	}
 }
 
 // wrapper type that performs a a protocol version handshake before returning the connection
 type HandshakeListener struct {
-	l transport.AuthenticatedListener
+	l       transport.AuthenticatedListener
 	timeout time.Duration
 }
 
-func (l HandshakeListener) Addr() (net.Addr) { return l.l.Addr() }
+func (l HandshakeListener) Addr() net.Addr { return l.l.Addr() }
 
 func (l HandshakeListener) Close() error { return l.l.Close() }