format source tree using goimports

rpc/dataconn/dataconn_client.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/golang/protobuf/proto"
+
 	"github.com/zrepl/zrepl/replication/logic/pdu"
 	"github.com/zrepl/zrepl/rpc/dataconn/stream"
 	"github.com/zrepl/zrepl/transport"
@@ -214,13 +215,12 @@ func (c *Client) ReqRecv(ctx context.Context, req *pdu.ReceiveReq, streamCopier
 	return res.res, cause
 }
 
-
 func (c *Client) ReqPing(ctx context.Context, req *pdu.PingReq) (*pdu.PingRes, error) {
 	conn, err := c.getWire(ctx)
 	if err != nil {
 		return nil, err
 	}
-			defer c.putWire(conn)
+	defer c.putWire(conn)
 
 	if err := c.send(ctx, conn, EndpointPing, req, nil); err != nil {
 		return nil, err
@@ -232,4 +232,4 @@ func (c *Client) ReqPing(ctx context.Context, req *pdu.PingReq) (*pdu.PingRes, e
 	}
 
 	return &res, nil
-}
+}

rpc/dataconn/dataconn_server.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/golang/protobuf/proto"
+
 	"github.com/zrepl/zrepl/logger"
 	"github.com/zrepl/zrepl/replication/logic/pdu"
 	"github.com/zrepl/zrepl/rpc/dataconn/stream"

rpc/dataconn/frameconn/frameconn.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/zrepl/zrepl/rpc/dataconn/base2bufpool"
 	"github.com/zrepl/zrepl/rpc/dataconn/timeoutconn"
 )

rpc/dataconn/frameconn/frameconn_shutdown_fsm.go

@@ -3,8 +3,8 @@ package frameconn
 import "sync"
 
 type shutdownFSM struct {
-	mtx            sync.Mutex
-	state          shutdownFSMState
+	mtx   sync.Mutex
+	state shutdownFSMState
 }
 
 type shutdownFSMState uint32
@@ -16,7 +16,7 @@ const (
 
 func newShutdownFSM() *shutdownFSM {
 	fsm := &shutdownFSM{
-		state:          shutdownStateOpen,
+		state: shutdownStateOpen,
 	}
 	return fsm
 }
@@ -34,4 +34,3 @@ func (f *shutdownFSM) IsShuttingDown() bool {
 	defer f.mtx.Unlock()
 	return f.state != shutdownStateOpen
 }
-

rpc/dataconn/frameconn/frameconn_test.go

@@ -19,4 +19,3 @@ func TestIsPublicFrameType(t *testing.T) {
 	assert.True(t, IsPublicFrameType(255))
 	assert.False(t, IsPublicFrameType(rstFrameType))
 }
-

rpc/dataconn/heartbeatconn/heartbeatconn_test.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
 	"github.com/zrepl/zrepl/rpc/dataconn/frameconn"
 )
 

rpc/dataconn/stream/stream_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	"github.com/zrepl/zrepl/logger"
 	"github.com/zrepl/zrepl/rpc/dataconn/heartbeatconn"
 	"github.com/zrepl/zrepl/util/socketpair"

rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator.go

@@ -11,6 +11,7 @@ import (
 
 	netssh "github.com/problame/go-netssh"
 	"github.com/zrepl/yaml-config"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/transport"
 	transportconfig "github.com/zrepl/zrepl/transport/fromconfig"

rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_closewrite.go

@@ -85,7 +85,7 @@ func (CloseWrite) receiver(wire transport.Wire) {
 
 	// consume half the test data, then detect an error, send it and CloseWrite
 
-	r := io.LimitReader(wire, int64(5 * len(closeWriteTestSendData)/3))
+	r := io.LimitReader(wire, int64(5*len(closeWriteTestSendData)/3))
 	_, err := io.Copy(ioutil.Discard, r)
 	noerror(err)
 
@@ -103,7 +103,7 @@ func (CloseWrite) receiver(wire transport.Wire) {
 		// io.Copy masks io.EOF to nil, and we expect io.EOF from the client's Close() call
 		log.Panicf("unexpected error returned from reading conn: %s", err)
 	}
-		
+
 	closeErr := wire.Close()
 	log.Printf("closeErr=%T %s", closeErr, closeErr)
 

rpc/dataconn/timeoutconn/timeoutconn_test.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	"github.com/zrepl/zrepl/util/socketpair"
 )