Back out of requiring a Closer for every Conn

.github/workflows/ci.yml

@@ -24,12 +24,13 @@ jobs:
     - name: Clean up extra files
       run: rm ./testcases/*.go
 
-    - name: Run golangci-lint
-      uses: actions-contrib/golangci-lint@v1
-      env:
-        GOROOT: ''
-      with:
-        golangci_lint_version: 'v1.27.0'
+    # This is disabled until is properly respects the golangci_lint_version
+    #- name: Run golangci-lint
+    #  uses: actions-contrib/golangci-lint@v1
+    #  env:
+    #    GOROOT: ''
+    #  with:
+    #    golangci_lint_version: 'v1.27.0'
 
     - name: Download deps
       run: go mod download

README.md

@@ -49,7 +49,6 @@ just using this library, these are not needed.
 ### v4 - Under Development
 
 - Move client to the new ircx package
-- Add Conn.Close
 
 ### v3
 

conn.go

@@ -11,16 +11,13 @@ import (
 type Conn struct {
 	*Reader
 	*Writer
-
-	rwc io.ReadWriteCloser
 }
 
 // NewConn creates a new Conn.
-func NewConn(rwc io.ReadWriteCloser) *Conn {
+func NewConn(rw io.ReadWriter) *Conn {
 	return &Conn{
-		NewReader(rwc),
-		NewWriter(rwc),
-		rwc,
+		NewReader(rw),
+		NewWriter(rw),
 	}
 }
 
@@ -117,8 +114,3 @@ func (r *Reader) ReadMessage() (*Message, error) {
 	// Parse the message from our line
 	return ParseMessage(line)
 }
-
-// Close will close the underlying TCP connection.
-func (c *Conn) Close() error {
-	return c.rwc.Close()
-}

conn_test.go

@@ -21,7 +21,6 @@ func (ew *errorWriter) Write([]byte) (int, error) {
 type readWriteCloser struct {
 	io.Reader
 	io.Writer
-	io.Closer
 }
 
 type testReadWriteCloser struct {
@@ -44,10 +43,6 @@ func (t *testReadWriteCloser) Write(p []byte) (int, error) {
 	return t.client.Write(p)
 }
 
-func (t *testReadWriteCloser) Close() error {
-	return nil
-}
-
 func testReadMessage(t *testing.T, c *Conn) *Message {
 	m, err := c.ReadMessage()
 	assert.NoError(t, err)
@@ -79,7 +74,6 @@ func TestWriteMessageError(t *testing.T) {
 	rw := &readWriteCloser{
 		&bytes.Buffer{},
 		&errorWriter{},
-		nil,
 	}
 
 	c := NewConn(rw)