Move handshake into its own package

handshake/handshake.go

@@ -1,4 +1,4 @@
-package message
+package handshake
 
 import (
 	"errors"
@@ -25,8 +25,8 @@ func (h *Handshake) Serialize() []byte {
 	return buf
 }
 
-// ReadHandshake parses a message from a stream. Returns `nil` on keep-alive message
-func ReadHandshake(r io.Reader) (*Handshake, error) {
+// Read parses a message from a stream. Returns `nil` on keep-alive message
+func Read(r io.Reader) (*Handshake, error) {
 	lengthBuf := make([]byte, 1)
 	_, err := io.ReadFull(r, lengthBuf)
 	if err != nil {

handshake/handshake_test.go

@@ -1,4 +1,4 @@
-package message
+package handshake
 
 import (
 	"bytes"
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestHandshakeSerialize(t *testing.T) {
+func TestSerialize(t *testing.T) {
 	tests := map[string]struct {
 		input  *Handshake
 		output []byte
@@ -28,7 +28,7 @@ func TestHandshakeSerialize(t *testing.T) {
 	}
 }
 
-func TestReadHandshake(t *testing.T) {
+func TestRead(t *testing.T) {
 	tests := map[string]struct {
 		input  []byte
 		output *Handshake
@@ -62,7 +62,7 @@ func TestReadHandshake(t *testing.T) {
 
 	for _, test := range tests {
 		reader := bytes.NewReader(test.input)
-		m, err := ReadHandshake(reader)
+		m, err := Read(reader)
 		if test.fails {
 			assert.NotNil(t, err)
 		} else {

message/message.go

@@ -80,8 +80,8 @@ func (m *Message) Serialize() []byte {
 	return buf
 }
 
-// ReadMessage parses a message from a stream. Returns `nil` on keep-alive message
-func ReadMessage(r io.Reader) (*Message, error) {
+// Read parses a message from a stream. Returns `nil` on keep-alive message
+func Read(r io.Reader) (*Message, error) {
 	lengthBuf := make([]byte, 4)
 	_, err := io.ReadFull(r, lengthBuf)
 	if err != nil {

message/message_test.go

@@ -129,7 +129,7 @@ func TestParsePiece(t *testing.T) {
 	}
 }
 
-func TestMessageSerialize(t *testing.T) {
+func TestSerialize(t *testing.T) {
 	tests := map[string]struct {
 		input  *Message
 		output []byte
@@ -150,7 +150,7 @@ func TestMessageSerialize(t *testing.T) {
 	}
 }
 
-func TestReadMessage(t *testing.T) {
+func TestRead(t *testing.T) {
 	tests := map[string]struct {
 		input  []byte
 		output *Message
@@ -180,7 +180,7 @@ func TestReadMessage(t *testing.T) {
 
 	for _, test := range tests {
 		reader := bytes.NewReader(test.input)
-		m, err := ReadMessage(reader)
+		m, err := Read(reader)
 		if test.fails {
 			assert.NotNil(t, err)
 		} else {
@@ -190,7 +190,7 @@ func TestReadMessage(t *testing.T) {
 	}
 }
 
-func TestMessageString(t *testing.T) {
+func TestString(t *testing.T) {
 	tests := []struct {
 		input  *Message
 		output string

p2p/p2p.go

@@ -8,6 +8,7 @@ import (
 	"net"
 	"strconv"
 
+	"github.com/veggiedefender/torrent-client/handshake"
 	"github.com/veggiedefender/torrent-client/message"
 )
 
@@ -44,7 +45,7 @@ func (d *Downloader) Download() error {
 	buf := make([]byte, pieceSize)
 	i := 0
 	for i < pieceSize {
-		msg, err := message.ReadMessage(conn)
+		msg, err := message.Read(conn)
 		if err != nil {
 			return err
 		}
@@ -98,8 +99,8 @@ func (p *Peer) connect(peerID [20]byte, infoHash [20]byte) (net.Conn, error) {
 	return conn, nil
 }
 
-func (d *Downloader) handshake(conn net.Conn) (*message.Handshake, error) {
-	req := message.Handshake{
+func (d *Downloader) handshake(conn net.Conn) (*handshake.Handshake, error) {
+	req := handshake.Handshake{
 		Pstr:     "BitTorrent protocol",
 		InfoHash: d.InfoHash,
 		PeerID:   d.PeerID,
@@ -109,7 +110,7 @@ func (d *Downloader) handshake(conn net.Conn) (*message.Handshake, error) {
 		return nil, err
 	}
 
-	res, err := message.ReadHandshake(conn)
+	res, err := handshake.Read(conn)
 	if err != nil {
 		return nil, err
 	}