Tidied up code

connection_handshake.go

@@ -440,9 +440,9 @@ func (c *connectionHandshakeV1_0) serverSignature(saltedPass []byte) string {
 func (c *connectionHandshakeV1_0) handshakeError(code int, message string) error {
 	if code >= 10 || code <= 20 {
 		return RQLAuthError{RQLDriverError{rqlError(message)}}
-	} else {
-		return RQLDriverError{rqlError(message)}
 	}
+
+	return RQLDriverError{rqlError(message)}
 }
 
 func (c *connectionHandshakeV1_0) hashFunc() func() hash.Hash {

connection_helper.go

@@ -5,11 +5,8 @@ import "encoding/binary"
 // Write 'data' to conn
 func (c *Connection) writeData(data []byte) error {
 	_, err := c.Conn.Write(data[:])
-	if err != nil {
-		return err
-	}
 
-	return nil
+	return err
 }
 
 func (c *Connection) read(buf []byte, length int) (total int, err error) {
@@ -20,11 +17,8 @@ func (c *Connection) read(buf []byte, length int) (total int, err error) {
 		}
 		total += n
 	}
-	if err != nil {
-		return total, err
-	}
 
-	return total, nil
+	return total, err
 }
 
 func (c *Connection) writeQuery(token int64, q []byte) error {

cursor.go

@@ -466,12 +466,7 @@ func (c *Cursor) IsNil() bool {
 	defer c.mu.RUnlock()
 
 	if len(c.buffer) > 0 {
-		bufferedItem := c.buffer[0]
-		if bufferedItem == nil {
-			return true
-		}
-
-		return false
+		return c.buffer[0] == nil
 	}
 
 	if len(c.responses) > 0 {
@@ -545,10 +540,7 @@ func (c *Cursor) extend(response *Response) {
 }
 
 func (c *Cursor) extendLocked(response *Response) {
-	for _, response := range response.Responses {
-		c.responses = append(c.responses, response)
-	}
-
+	c.responses = append(c.responses, response.Responses...)
 	c.finished = response.Type != p.Response_SUCCESS_PARTIAL
 	c.fetching = false
 	c.isAtom = response.Type == p.Response_SUCCESS_ATOM
@@ -652,9 +644,7 @@ func (c *Cursor) bufferNextResponse() error {
 
 	// If response is an ATOM then try and convert to an array
 	if data, ok := value.([]interface{}); ok && c.isAtom {
-		for _, v := range data {
-			c.buffer = append(c.buffer, v)
-		}
+		c.buffer = append(c.buffer, data...)
 	} else if value == nil {
 		c.buffer = append(c.buffer, nil)
 	} else {

node.go

@@ -3,7 +3,6 @@ package gorethink
 import (
 	"sync"
 
-	"github.com/hailocab/go-hostpool"
 	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
@@ -15,7 +14,6 @@ type Node struct {
 
 	cluster *Cluster
 	pool    *Pool
-	hpr     hostpool.HostPoolResponse
 
 	mu     sync.RWMutex
 	closed bool
@@ -91,12 +89,7 @@ func (n *Node) Query(q Query) (cursor *Cursor, err error) {
 		return nil, ErrInvalidNode
 	}
 
-	cursor, err = n.pool.Query(q)
-	if err != nil {
-		return cursor, err
-	}
-
-	return cursor, err
+	return n.pool.Query(q)
 }
 
 // Exec executes a ReQL query using this nodes connection pool.
@@ -105,12 +98,7 @@ func (n *Node) Exec(q Query) (err error) {
 		return ErrInvalidNode
 	}
 
-	err = n.pool.Exec(q)
-	if err != nil {
-		return err
-	}
-
-	return err
+	return n.pool.Exec(q)
 }
 
 // Server returns the server name and server UUID being used by a connection.

pool.go

@@ -13,8 +13,6 @@ const maxBadConnRetries = 3
 
 var (
 	errPoolClosed = errors.New("gorethink: pool is closed")
-	errConnClosed = errors.New("gorethink: conn is closed")
-	errConnBusy   = errors.New("gorethink: conn is busy")
 )
 
 // A Pool is used to store a pool of connections to a single RethinkDB server