tests: Use WriteFrame from proxy api package.

Use the WriteFrame from proxy api package. Remove the local
WriteFrame function from the mock package which was introduced
when the WriteFrame from the proxy package was not goroutine safe.

Signed-off-by: Archana Shinde <[email protected]>

Author: amshinde

Diff for: mock/mock_proxy.go

@@ -15,11 +15,7 @@
 package mock
 
 import (
-	"encoding/binary"
 	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
 	"net"
 	"os"
 	"sync"
@@ -248,49 +244,3 @@ func (proxy *Proxy) Stop() {
 	os.Remove(proxy.connectionPath)
 	proxy.log("Stopped")
 }
-
-const (
-	flagInError = 1 << (4 + iota)
-)
-
-const minHeaderLength = 12
-
-// WriteFrame reimplemented here till the one in api package
-// is implemented as goroutine-safe
-func WriteFrame(w io.Writer, frame *api.Frame) error {
-	header := &frame.Header
-
-	if len(frame.Payload) < header.PayloadLength {
-		return fmt.Errorf("frame: bad payload length %d",
-			header.PayloadLength)
-	}
-
-	// Prepare the header.
-	len := minHeaderLength + header.PayloadLength
-	buf := make([]byte, len)
-	binary.BigEndian.PutUint16(buf[0:2], uint16(header.Version))
-	buf[2] = byte(header.HeaderLength / 4)
-	flags := byte(0)
-	if frame.Header.InError {
-		flags |= flagInError
-	}
-	buf[6] = flags | byte(header.Type)&0xf
-	buf[7] = byte(header.Opcode)
-	binary.BigEndian.PutUint32(buf[8:8+4], uint32(header.PayloadLength))
-
-	// Write payload if needed
-	if header.PayloadLength > 0 {
-		copy(buf[minHeaderLength:], frame.Payload[0:header.PayloadLength])
-	}
-
-	n, err := w.Write(buf)
-	if err != nil {
-		return err
-	}
-
-	if n != len {
-		return errors.New("frame: couldn't write frame")
-	}
-
-	return nil
-}

Diff for: mock/protocol.go

@@ -160,7 +160,7 @@ func (proto *protocol) Serve(conn net.Conn, userData interface{}) error {
 		resp := proto.handleCommand(ctx, frame)
 
 		// Send the response back to the client.
-		if err = WriteFrame(conn, resp); err != nil {
+		if err = api.WriteFrame(conn, resp); err != nil {
 			// Something made us unable to write the response back
 			// to the client (could be a disconnection, ...).
 			return err