Extract the framing layer into a separate package (#27)

It is not really necessary because there will be only one layer but it will be convenient to have a layers package among other regular packages.

client.go

@@ -4,6 +4,7 @@ import (
  "fmt"
  "time"
 
+ "github.com/myzhan/avroipc/layers"
  "github.com/myzhan/avroipc/protocols"
  "github.com/myzhan/avroipc/transports"
 )
@@ -19,7 +20,7 @@ type client struct {
  sendTimeout time.Duration
 
  transport transports.Transport
- framingLayer FramingLayer
+ framingLayer layers.FramingLayer
  callProtocol protocols.CallProtocol
  handshakeProtocol protocols.HandshakeProtocol
 }
@@ -44,7 +45,7 @@ func NewClient(addr string, timeout, sendTimeout time.Duration, bufferSize, comp
  return nil, err
  }
 
- proto, err := protocols.NewAvroSourceProtocol()
+ proto, err := protocols.NewAvroSource()
  if err != nil {
  return nil, err
  }
@@ -58,14 +59,14 @@ func NewClientWithTrans(trans transports.Transport, proto protocols.MessageProto
  c.sendTimeout = sendTimeout
 
  c.transport = trans
- c.framingLayer = NewFramingLayer(trans)
+ c.framingLayer = layers.NewFraming(trans)
 
- c.callProtocol, err = protocols.NewCallProtocol(proto)
+ c.callProtocol, err = protocols.NewCall(proto)
  if err != nil {
  return nil, err
  }
 
- c.handshakeProtocol, err = protocols.NewHandshakeProtocol()
+ c.handshakeProtocol, err = protocols.NewHandshake()
  if err != nil {
  return nil, err
  }

framing.go → layers/framing.go

@@ -1,4 +1,4 @@
-package avroipc
+package layers
 
 import (
  "bytes"
@@ -26,7 +26,7 @@ type framingLayer struct {
  serial uint32
 }
 
-func NewFramingLayer(trans transports.Transport) FramingLayer {
+func NewFraming(trans transports.Transport) FramingLayer {
  return &framingLayer{
  trans: trans,
  }

framing_test.go → layers/framing_test.go

@@ -1,19 +1,20 @@
-package avroipc_test
+package layers_test
 
 import (
  "bytes"
  "fmt"
  "testing"
 
- "github.com/myzhan/avroipc"
  "github.com/myzhan/avroipc/mocks"
  "github.com/stretchr/testify/mock"
  "github.com/stretchr/testify/require"
+
+ "github.com/myzhan/avroipc/layers"
 )
 
-func prepareFramingLayer() (avroipc.FramingLayer, *mocks.MockTransport) {
+func prepareFramingLayer() (layers.FramingLayer, *mocks.MockTransport) {
  m := &mocks.MockTransport{}
- f := avroipc.NewFramingLayer(m)
+ f := layers.NewFraming(m)
 
  return f, m
 }

protocols/call.go

@@ -25,7 +25,7 @@ type сallProtocol struct {
  booleanCodec *goavro.Codec
 }
 
-func NewCallProtocol(proto MessageProtocol) (CallProtocol, error) {
+func NewCall(proto MessageProtocol) (CallProtocol, error) {
  p := &сallProtocol{
  proto: proto,
  }

protocols/call_test.go

@@ -13,7 +13,7 @@ import (
 func prepareCallProtocol(t *testing.T) (protocols.CallProtocol, *mocks.MockProtocol) {
  m := &mocks.MockProtocol{}
 
- p, err := protocols.NewCallProtocol(m)
+ p, err := protocols.NewCall(m)
  require.NoError(t, err)
 
  return p, m

protocols/handshake.go

@@ -37,7 +37,7 @@ type handshakeProtocol struct {
  handshakeResponseCodec *goavro.Codec
 }
 
-func NewHandshakeProtocol() (HandshakeProtocol, error) {
+func NewHandshake() (HandshakeProtocol, error) {
  p := &handshakeProtocol{
  serverHash: getMD5(messageProtocol),
  clientHash: getMD5(messageProtocol),

protocols/handshake_internal_test.go

@@ -37,7 +37,7 @@ func TestHandshakeProtocol_PrepareRequest(t *testing.T) {
  0x0, 0x0,
  }
 
- p, err := NewHandshakeProtocol()
+ p, err := NewHandshake()
  require.NoError(t, err)
 
  actual, err := p.PrepareRequest()
@@ -59,7 +59,7 @@ func TestHandshakeProtocol_PrepareRequest(t *testing.T) {
  0x0, 0x0,
  }
 
- p, err := NewHandshakeProtocol()
+ p, err := NewHandshake()
  require.NoError(t, err)
 
  h := p.(*handshakeProtocol)
@@ -79,7 +79,7 @@ func TestHandshakeProtocol_ProcessResponse(t *testing.T) {
  0x7,
  }
 
- p, err := NewHandshakeProtocol()
+ p, err := NewHandshake()
  require.NoError(t, err)
 
  needResend, err := p.ProcessResponse(response)
@@ -94,7 +94,7 @@ func TestHandshakeProtocol_ProcessResponse(t *testing.T) {
  0x0,
  }
 
- p, err := NewHandshakeProtocol()
+ p, err := NewHandshake()
  require.NoError(t, err)
 
  needResend, err := p.ProcessResponse(response)
@@ -115,7 +115,7 @@ func TestHandshakeProtocol_ProcessResponse(t *testing.T) {
  0x0,
  }
 
- p, err := NewHandshakeProtocol()
+ p, err := NewHandshake()
  require.NoError(t, err)
 
  needResend, err := p.ProcessResponse(response)
@@ -135,7 +135,7 @@ func TestHandshakeProtocol_ProcessResponse(t *testing.T) {
  0x0,
  }
 
- p, err := NewHandshakeProtocol()
+ p, err := NewHandshake()
  require.NoError(t, err)
 
  needResend, err := p.ProcessResponse(response)
@@ -155,7 +155,7 @@ func TestHandshakeProtocol_ProcessResponse(t *testing.T) {
  0x0,
  }
 
- p, err := NewHandshakeProtocol()
+ p, err := NewHandshake()
  require.NoError(t, err)
 
  h := p.(*handshakeProtocol)
@@ -179,7 +179,7 @@ func TestHandshakeProtocol_ProcessResponse(t *testing.T) {
  0x0,
  }
 
- p, err := NewHandshakeProtocol()
+ p, err := NewHandshake()
  require.NoError(t, err)
 
  needResend, err := p.ProcessResponse(response)
@@ -199,7 +199,7 @@ func TestHandshakeProtocol_ProcessResponse(t *testing.T) {
  0x0,
  }
 
- p, err := NewHandshakeProtocol()
+ p, err := NewHandshake()
  require.NoError(t, err)
 
  h := p.(*handshakeProtocol)

protocols/message.go

@@ -28,7 +28,7 @@ type AvroSourceProtocol struct {
  messages map[string]message
 }
 
-func NewAvroSourceProtocol() (MessageProtocol, error) {
+func NewAvroSource() (MessageProtocol, error) {
  p := &AvroSourceProtocol{
  messages: make(map[string]message),
  }

protocols/message_test.go

@@ -24,7 +24,7 @@ func makeArrayDatum(bodies ...string) interface{} {
 }
 
 func TestAvroSourceProtocol_PrepareMessage(t *testing.T) {
- p, err := protocols.NewAvroSourceProtocol()
+ p, err := protocols.NewAvroSource()
  require.NoError(t, err)
 
  t.Run("bad method", func(t *testing.T) {
@@ -67,7 +67,7 @@ func TestAvroSourceProtocol_PrepareMessage(t *testing.T) {
 }
 
 func TestAvroSourceProtocol_ParseMessage(t *testing.T) {
- p, err := protocols.NewAvroSourceProtocol()
+ p, err := protocols.NewAvroSource()
  require.NoError(t, err)
 
  t.Run("bad method", func(t *testing.T) {
@@ -97,7 +97,7 @@ func TestAvroSourceProtocol_ParseMessage(t *testing.T) {
 }
 
 func TestAvroSourceProtocol_ParseError(t *testing.T) {
- p, err := protocols.NewAvroSourceProtocol()
+ p, err := protocols.NewAvroSource()
  require.NoError(t, err)
 
  t.Run("bad method", func(t *testing.T) {