Remove wrap prefix

wrappers/blockcipher.go

@@ -13,7 +13,7 @@ import (
 type BlockCipher struct {
 	buf *bytes.Buffer
 
-	conn      WrapStreamReadWriteCloser
+	conn      StreamReadWriteCloser
 	encryptor cipher.BlockMode
 	decryptor cipher.BlockMode
 }
@@ -88,7 +88,7 @@ func (b *BlockCipher) Close() error {
 	return b.conn.Close()
 }
 
-func NewBlockCipher(conn WrapStreamReadWriteCloser, encryptor, decryptor cipher.BlockMode) WrapStreamReadWriteCloser {
+func NewBlockCipher(conn StreamReadWriteCloser, encryptor, decryptor cipher.BlockMode) StreamReadWriteCloser {
 	return &BlockCipher{
 		buf:       &bytes.Buffer{},
 		conn:      conn,

wrappers/conn.go

@@ -96,7 +96,7 @@ func (c *Conn) LogError(msg string, data ...interface{}) {
 	c.logger.Errorw(msg, data...)
 }
 
-func NewConn(conn net.Conn, connID string, purpose ConnPurpose, publicIPv4, publicIPv6 net.IP) WrapStreamReadWriteCloser {
+func NewConn(conn net.Conn, connID string, purpose ConnPurpose, publicIPv4, publicIPv6 net.IP) StreamReadWriteCloser {
 	logger := zap.S().With(
 		"connection_id", connID,
 		"local_address", conn.LocalAddr(),

wrappers/ctx.go

@@ -9,7 +9,7 @@ import (
 
 type Ctx struct {
 	cancel context.CancelFunc
-	conn   WrapStreamReadWriteCloser
+	conn   StreamReadWriteCloser
 	ctx    context.Context
 }
 
@@ -67,7 +67,7 @@ func (c *Ctx) Close() error {
 	return c.conn.Close()
 }
 
-func NewCtx(ctx context.Context, cancel context.CancelFunc, conn WrapStreamReadWriteCloser) WrapStreamReadWriteCloser {
+func NewCtx(ctx context.Context, cancel context.CancelFunc, conn StreamReadWriteCloser) StreamReadWriteCloser {
 	return &Ctx{
 		ctx:    ctx,
 		cancel: cancel,

wrappers/mtproto_abridged.go

@@ -18,7 +18,7 @@ const (
 )
 
 type MTProtoAbridged struct {
-	conn WrapStreamReadWriteCloser
+	conn StreamReadWriteCloser
 	opts *mtproto.ConnectionOpts
 
 	readCounter  uint32
@@ -156,7 +156,7 @@ func (m *MTProtoAbridged) Close() error {
 	return m.conn.Close()
 }
 
-func NewMTProtoAbridged(conn WrapStreamReadWriteCloser, opts *mtproto.ConnectionOpts) WrapPacketReadWriteCloser {
+func NewMTProtoAbridged(conn StreamReadWriteCloser, opts *mtproto.ConnectionOpts) PacketReadWriteCloser {
 	return &MTProtoAbridged{
 		conn: conn,
 		opts: opts,

wrappers/mtproto_cipher.go

@@ -22,7 +22,7 @@ const (
 
 var emptyIP = [4]byte{0x00, 0x00, 0x00, 0x00}
 
-func NewMiddleProxyCipher(conn WrapStreamReadWriteCloser, req *rpc.NonceRequest, resp *rpc.NonceResponse, secret []byte) WrapStreamReadWriteCloser {
+func NewMiddleProxyCipher(conn StreamReadWriteCloser, req *rpc.NonceRequest, resp *rpc.NonceResponse, secret []byte) StreamReadWriteCloser {
 	localAddr := conn.LocalAddr()
 	remoteAddr := conn.RemoteAddr()
 

wrappers/mtproto_frame.go

@@ -20,7 +20,7 @@ const (
 var mtprotoFramePadding = []byte{0x04, 0x00, 0x00, 0x00}
 
 type MTProtoFrame struct {
-	conn       WrapStreamReadWriteCloser
+	conn       StreamReadWriteCloser
 	readSeqNo  int32
 	writeSeqNo int32
 }
@@ -142,7 +142,7 @@ func (m *MTProtoFrame) Close() error {
 	return m.conn.Close()
 }
 
-func NewMTProtoFrame(conn WrapStreamReadWriteCloser, seqNo int32) WrapPacketReadWriteCloser {
+func NewMTProtoFrame(conn StreamReadWriteCloser, seqNo int32) PacketReadWriteCloser {
 	return &MTProtoFrame{
 		conn:       conn,
 		readSeqNo:  seqNo,

wrappers/mtproto_intermediate.go

@@ -13,7 +13,7 @@ import (
 const mtprotoIntermediateQuickAckLength = 0x80000000
 
 type MTProtoIntermediate struct {
-	conn WrapStreamReadWriteCloser
+	conn StreamReadWriteCloser
 	opts *mtproto.ConnectionOpts
 
 	readCounter  uint32
@@ -111,7 +111,7 @@ func (m *MTProtoIntermediate) Close() error {
 	return m.conn.Close()
 }
 
-func NewMTProtoIntermediate(conn WrapStreamReadWriteCloser, opts *mtproto.ConnectionOpts) WrapPacketReadWriteCloser {
+func NewMTProtoIntermediate(conn StreamReadWriteCloser, opts *mtproto.ConnectionOpts) PacketReadWriteCloser {
 	return &MTProtoIntermediate{
 		conn: conn,
 		opts: opts,

wrappers/mtproto_proxy.go

@@ -11,7 +11,7 @@ import (
 )
 
 type MTProtoProxy struct {
-	conn WrapPacketReadWriteCloser
+	conn PacketReadWriteCloser
 	req  *rpc.ProxyRequest
 
 	readCounter  uint32
@@ -129,7 +129,7 @@ func (m *MTProtoProxy) Close() error {
 	return m.conn.Close()
 }
 
-func NewMTProtoProxy(conn WrapPacketReadWriteCloser, connOpts *mtproto.ConnectionOpts, adTag []byte) (WrapPacketReadWriteCloser, error) {
+func NewMTProtoProxy(conn PacketReadWriteCloser, connOpts *mtproto.ConnectionOpts, adTag []byte) (PacketReadWriteCloser, error) {
 	req, err := rpc.NewProxyRequest(connOpts.ClientAddr, conn.LocalAddr(), connOpts, adTag)
 	if err != nil {
 		return nil, errors.Annotate(err, "Cannot create new RPC proxy request")

wrappers/streamcipher.go

@@ -10,7 +10,7 @@ import (
 type StreamCipher struct {
 	encryptor cipher.Stream
 	decryptor cipher.Stream
-	conn      WrapStreamReadWriteCloser
+	conn      StreamReadWriteCloser
 }
 
 func (s *StreamCipher) Read(p []byte) (int, error) {
@@ -58,7 +58,7 @@ func (s *StreamCipher) Close() error {
 	return s.conn.Close()
 }
 
-func NewStreamCipher(conn WrapStreamReadWriteCloser, encryptor, decryptor cipher.Stream) WrapStreamReadWriteCloser {
+func NewStreamCipher(conn StreamReadWriteCloser, encryptor, decryptor cipher.Stream) StreamReadWriteCloser {
 	return &StreamCipher{
 		conn:      conn,
 		encryptor: encryptor,

wrappers/wrap.go

@@ -15,74 +15,74 @@ type Wrap interface {
 	RemoteAddr() *net.TCPAddr
 }
 
-type WrapWriter interface {
+type Writer interface {
 	io.Writer
 	Wrap
 }
 
-type WrapCloser interface {
+type Closer interface {
 	io.Closer
 	Wrap
 }
 
-type WrapWriteCloser interface {
+type WriteCloser interface {
 	io.Closer
-	WrapWriter
+	Writer
 }
 
-type WrapStreamReader interface {
+type StreamReader interface {
 	io.Reader
 	Wrap
 }
 
-type WrapStreamReadCloser interface {
+type StreamReadCloser interface {
 	io.Closer
-	WrapStreamReader
+	StreamReader
 }
 
-type WrapStreamReadWriter interface {
+type StreamReadWriter interface {
 	io.Writer
-	WrapStreamReader
+	StreamReader
 }
 
-type WrapStreamWriteCloser interface {
+type StreamWriteCloser interface {
 	io.Closer
 	io.Writer
 	Wrap
 }
 
-type WrapStreamReadWriteCloser interface {
+type StreamReadWriteCloser interface {
 	io.Closer
-	WrapStreamReadWriter
+	StreamReadWriter
 }
 
-type WrapPacketReader interface {
+type PacketReader interface {
 	Read() ([]byte, error)
 	Wrap
 }
 
-type WrapPacketWriter interface {
+type PacketWriter interface {
 	io.Writer
 	Wrap
 }
 
-type WrapPacketReadWriter interface {
+type PacketReadWriter interface {
 	io.Writer
-	WrapPacketReader
+	PacketReader
 }
 
-type WrapBlockReadCloser interface {
+type BlockReadCloser interface {
 	io.Closer
-	WrapPacketReader
+	PacketReader
 }
 
-type WrapPacketWriteCloser interface {
+type PacketWriteCloser interface {
 	io.Writer
 	io.Closer
 	Wrap
 }
 
-type WrapPacketReadWriteCloser interface {
+type PacketReadWriteCloser interface {
 	io.Closer
-	WrapPacketReadWriter
+	PacketReadWriter
 }