refactor: get rid of fillXXX functions, in favor of Body method

NB: all deleted tests were checking that functions passed from
constructor object to fillXXX function were passed in right order, so
removing them is not a problem.

Author: bigbes

export_test.go

@@ -27,7 +27,7 @@ func (req *futureMockRequest) Async() bool {
 	return false
 }
 
-func (req *futureMockRequest) Body(resolver SchemaResolver, enc *msgpack.Encoder) error {
+func (req *futureMockRequest) Body(_ SchemaResolver, _ *msgpack.Encoder) error {
 	return nil
 }
 

future_test.go

@@ -22,26 +22,6 @@ type Prepared struct {
 	Conn        *Connection
 }
 
-func fillPrepare(enc *msgpack.Encoder, expr string) error {
-	enc.EncodeMapLen(1)
-	enc.EncodeUint(uint64(iproto.IPROTO_SQL_TEXT))
-	return enc.EncodeString(expr)
-}
-
-func fillUnprepare(enc *msgpack.Encoder, stmt Prepared) error {
-	enc.EncodeMapLen(1)
-	enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID))
-	return enc.EncodeUint(uint64(stmt.StatementID))
-}
-
-func fillExecutePrepared(enc *msgpack.Encoder, stmt Prepared, args interface{}) error {
-	enc.EncodeMapLen(2)
-	enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID))
-	enc.EncodeUint(uint64(stmt.StatementID))
-	enc.EncodeUint(uint64(iproto.IPROTO_SQL_BIND))
-	return encodeSQLBind(enc, args)
-}
-
 // NewPreparedFromResponse constructs a Prepared object.
 func NewPreparedFromResponse(conn *Connection, resp Response) (*Prepared, error) {
 	if resp == nil {
@@ -81,8 +61,16 @@ func NewPrepareRequest(expr string) *PrepareRequest {
 }
 
 // Body fills an msgpack.Encoder with the execute request body.
-func (req *PrepareRequest) Body(res SchemaResolver, enc *msgpack.Encoder) error {
-	return fillPrepare(enc, req.expr)
+func (req *PrepareRequest) Body(_ SchemaResolver, enc *msgpack.Encoder) error {
+	if err := enc.EncodeMapLen(1); err != nil {
+		return err
+	}
+
+	if err := enc.EncodeUint(uint64(iproto.IPROTO_SQL_TEXT)); err != nil {
+		return err
+	}
+
+	return enc.EncodeString(req.expr)
 }
 
 // Context sets a passed context to the request.
@@ -126,8 +114,16 @@ func (req *UnprepareRequest) Conn() *Connection {
 }
 
 // Body fills an msgpack.Encoder with the execute request body.
-func (req *UnprepareRequest) Body(res SchemaResolver, enc *msgpack.Encoder) error {
-	return fillUnprepare(enc, *req.stmt)
+func (req *UnprepareRequest) Body(_ SchemaResolver, enc *msgpack.Encoder) error {
+	if err := enc.EncodeMapLen(1); err != nil {
+		return err
+	}
+
+	if err := enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID)); err != nil {
+		return err
+	}
+
+	return enc.EncodeUint(uint64(req.stmt.StatementID))
 }
 
 // Context sets a passed context to the request.
@@ -171,8 +167,24 @@ func (req *ExecutePreparedRequest) Args(args interface{}) *ExecutePreparedReques
 }
 
 // Body fills an msgpack.Encoder with the execute request body.
-func (req *ExecutePreparedRequest) Body(res SchemaResolver, enc *msgpack.Encoder) error {
-	return fillExecutePrepared(enc, *req.stmt, req.args)
+func (req *ExecutePreparedRequest) Body(_ SchemaResolver, enc *msgpack.Encoder) error {
+	if err := enc.EncodeMapLen(2); err != nil {
+		return err
+	}
+
+	if err := enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID)); err != nil {
+		return err
+	}
+
+	if err := enc.EncodeUint(uint64(req.stmt.StatementID)); err != nil {
+		return err
+	}
+
+	if err := enc.EncodeUint(uint64(iproto.IPROTO_SQL_BIND)); err != nil {
+		return err
+	}
+
+	return encodeSQLBind(enc, req.args)
 }
 
 // Context sets a passed context to the request.

prepared.go

@@ -68,22 +68,37 @@ type IdRequest struct {
 	protocolInfo ProtocolInfo
 }
 
-func fillId(enc *msgpack.Encoder, protocolInfo ProtocolInfo) error {
-	enc.EncodeMapLen(2)
+// NewIdRequest returns a new IdRequest.
+func NewIdRequest(protocolInfo ProtocolInfo) *IdRequest {
+	req := new(IdRequest)
+	req.rtype = iproto.IPROTO_ID
+	req.protocolInfo = protocolInfo.Clone()
+	return req
+}
 
-	enc.EncodeUint(uint64(iproto.IPROTO_VERSION))
-	if err := enc.Encode(protocolInfo.Version); err != nil {
+// Body fills an msgpack.Encoder with the id request body.
+func (req *IdRequest) Body(_ SchemaResolver, enc *msgpack.Encoder) error {
+	if err := enc.EncodeMapLen(2); err != nil {
 		return err
 	}
 
-	enc.EncodeUint(uint64(iproto.IPROTO_FEATURES))
+	if err := enc.EncodeUint(uint64(iproto.IPROTO_VERSION)); err != nil {
+		return err
+	}
 
-	t := len(protocolInfo.Features)
-	if err := enc.EncodeArrayLen(t); err != nil {
+	if err := enc.Encode(req.protocolInfo.Version); err != nil {
 		return err
 	}
 
-	for _, feature := range protocolInfo.Features {
+	if err := enc.EncodeUint(uint64(iproto.IPROTO_FEATURES)); err != nil {
+		return err
+	}
+
+	if err := enc.EncodeArrayLen(len(req.protocolInfo.Features)); err != nil {
+		return err
+	}
+
+	for _, feature := range req.protocolInfo.Features {
 		if err := enc.Encode(feature); err != nil {
 			return err
 		}
@@ -92,19 +107,6 @@ func fillId(enc *msgpack.Encoder, protocolInfo ProtocolInfo) error {
 	return nil
 }
 
-// NewIdRequest returns a new IdRequest.
-func NewIdRequest(protocolInfo ProtocolInfo) *IdRequest {
-	req := new(IdRequest)
-	req.rtype = iproto.IPROTO_ID
-	req.protocolInfo = protocolInfo.Clone()
-	return req
-}
-
-// Body fills an msgpack.Encoder with the id request body.
-func (req *IdRequest) Body(res SchemaResolver, enc *msgpack.Encoder) error {
-	return fillId(enc, req.protocolInfo)
-}
-
 // Context sets a passed context to the request.
 //
 // Pay attention that when using context with request objects,