From 3161c56abad3254fb7cc5d4f08481ffc13169fa6 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Sun, 2 Apr 2017 13:43:24 +0200
Subject: [PATCH] refactor

---
 app/proxyman/mux/mux.go      |  2 +-
 app/proxyman/mux/mux_test.go |  2 +-
 app/proxyman/mux/reader.go   | 10 +++++-----
 app/proxyman/mux/writer.go   | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/proxyman/mux/mux.go b/app/proxyman/mux/mux.go
index 32fb94e44..5d0a15fd5 100644
--- a/app/proxyman/mux/mux.go
+++ b/app/proxyman/mux/mux.go
@@ -113,7 +113,7 @@ func (m *Client) Closed() bool {
 
 func (m *Client) fetchInput(ctx context.Context, s *session) {
 	dest, _ := proxy.TargetFromContext(ctx)
-	writer := &MuxWriter{
+	writer := &Writer{
 		dest:   dest,
 		id:     s.id,
 		writer: m.inboundRay.InboundInput(),
diff --git a/app/proxyman/mux/mux_test.go b/app/proxyman/mux/mux_test.go
index 05a013525..aa95ad8be 100644
--- a/app/proxyman/mux/mux_test.go
+++ b/app/proxyman/mux/mux_test.go
@@ -20,7 +20,7 @@ func TestReaderWriter(t *testing.T) {
 
 	payload := buf.New()
 	payload.AppendBytes('a', 'b', 'c', 'd')
-	writer.Write(payload)
+	assert.Error(writer.Write(payload)).IsNil()
 
 	writer.Close()
 
diff --git a/app/proxyman/mux/reader.go b/app/proxyman/mux/reader.go
index 7c6ff24dc..04971d459 100644
--- a/app/proxyman/mux/reader.go
+++ b/app/proxyman/mux/reader.go
@@ -7,20 +7,20 @@ import (
 	"v2ray.com/core/common/serial"
 )
 
-type MuxReader struct {
+type Reader struct {
 	reader          io.Reader
 	remainingLength int
 	buffer          *buf.Buffer
 }
 
-func NewReader(reader buf.Reader) *MuxReader {
-	return &MuxReader{
+func NewReader(reader buf.Reader) *Reader {
+	return &Reader{
 		reader: buf.ToBytesReader(reader),
 		buffer: buf.NewLocal(1024),
 	}
 }
 
-func (r *MuxReader) ReadMetadata() (*FrameMetadata, error) {
+func (r *Reader) ReadMetadata() (*FrameMetadata, error) {
 	b := r.buffer
 	b.Clear()
 
@@ -35,7 +35,7 @@ func (r *MuxReader) ReadMetadata() (*FrameMetadata, error) {
 	return ReadFrameFrom(b.Bytes())
 }
 
-func (r *MuxReader) Read() (*buf.Buffer, bool, error) {
+func (r *Reader) Read() (*buf.Buffer, bool, error) {
 	b := buf.New()
 	var dataLen int
 	if r.remainingLength > 0 {
diff --git a/app/proxyman/mux/writer.go b/app/proxyman/mux/writer.go
index 62d6980fc..dd72313dd 100644
--- a/app/proxyman/mux/writer.go
+++ b/app/proxyman/mux/writer.go
@@ -6,22 +6,22 @@ import (
 	"v2ray.com/core/common/serial"
 )
 
-type MuxWriter struct {
+type Writer struct {
 	id       uint16
 	dest     net.Destination
 	writer   buf.Writer
 	followup bool
 }
 
-func NewWriter(id uint16, dest net.Destination, writer buf.Writer) *MuxWriter {
-	return &MuxWriter{
+func NewWriter(id uint16, dest net.Destination, writer buf.Writer) *Writer {
+	return &Writer{
 		id:     id,
 		dest:   dest,
 		writer: writer,
 	}
 }
 
-func (w *MuxWriter) writeInternal(b *buf.Buffer) error {
+func (w *Writer) writeInternal(b *buf.Buffer) error {
 	meta := FrameMetadata{
 		SessionID: w.id,
 		Target:    w.dest,
@@ -57,7 +57,7 @@ func (w *MuxWriter) writeInternal(b *buf.Buffer) error {
 	return w.writer.Write(frame)
 }
 
-func (w *MuxWriter) Write(b *buf.Buffer) error {
+func (w *Writer) Write(b *buf.Buffer) error {
 	defer b.Release()
 
 	if err := w.writeInternal(b); err != nil {
@@ -71,7 +71,7 @@ func (w *MuxWriter) Write(b *buf.Buffer) error {
 	return nil
 }
 
-func (w *MuxWriter) Close() {
+func (w *Writer) Close() {
 	meta := FrameMetadata{
 		SessionID:     w.id,
 		Target:        w.dest,