move any struct that is used by more than one file to its own file, rename marshallers

Author: afshin

client.go

@@ -192,7 +192,7 @@ func (c *Client) listen(handle string, listener chan *http.Response) {
 }
 
 func (c *Client) receive(payload []byte) error {
-	handle, res, err := unmarshalRes(payload)
+	handle, res, err := resUnmarshal(payload)
 	if err != nil {
 		return err.(*Error).escalate(errRECV)
 	}

destination.go

@@ -0,0 +1,12 @@
+// Copyright 2016 Afshin Darian. All rights reserved.
+// Use of this source code is governed by The MIT License
+// that can be found in the LICENSE file.
+
+package sleuth
+
+// destination describes the group, node, and specific handle of a message.
+type destination struct {
+	group  string
+	handle string
+	node   string
+}

request.go

@@ -11,12 +11,6 @@ import (
 	"net/http"
 )
 
-type destination struct {
-	group  string
-	handle string
-	node   string
-}
-
 type request struct {
 	Body        []byte              `json:"body,omitempty"`
 	Destination string              `json:"destination"`

response.go

@@ -24,13 +24,13 @@ type body struct {
 
 func (*body) Close() error { return nil }
 
-func marshalRes(group string, res *response) []byte {
+func resMarshal(group string, res *response) []byte {
 	// This will never fail to marshal, so error can be ignored.
 	marshalled, _ := json.Marshal(res)
 	return append([]byte(group+recv), zip(marshalled)...)
 }
 
-func unmarshalRes(payload []byte) (string, *http.Response, error) {
+func resUnmarshal(payload []byte) (string, *http.Response, error) {
 	var handle string
 	var res *http.Response
 	unzipped, err := unzip(payload)

sleuth_test.go

@@ -136,7 +136,7 @@ func TestClientReceiveBadHandle(t *testing.T) {
 	log, _ := logger.New(logger.Silent)
 	c := newClient(GROUP, nil, log)
 	res := &response{Handle: "1"}
-	err := c.receive(marshalRes(GROUP, res)[len(GROUP)+len(recv):])
+	err := c.receive(resMarshal(GROUP, res)[len(GROUP)+len(recv):])
 	if err == nil {
 		t.Errorf("expected client receive to fail on bad handle")
 		return
@@ -230,9 +230,9 @@ func TestRequestUnmarshalBadJSON(t *testing.T) {
 
 func TestResponseUnmarshalBadJSON(t *testing.T) {
 	payload := zip([]byte("{bad json}"))
-	_, _, err := unmarshalRes(payload)
+	_, _, err := resUnmarshal(payload)
 	if err == nil {
-		t.Errorf("expected unmarshalRes to fail on bad json")
+		t.Errorf("expected resUnmarshal to fail on bad json")
 		return
 	}
 	testCodes(t, err, []int{errResUnmarshalJSON})

writer.go

@@ -31,7 +31,7 @@ func (w *writer) Write(data []byte) (int, error) {
 		header.Add("Content-Type", http.DetectContentType(data))
 	}
 	w.output.Body = data
-	payload := marshalRes(w.group, w.output)
+	payload := resMarshal(w.group, w.output)
 	if err := w.whisperer.Whisper(w.peer, payload); err != nil {
 		return 0, newError(errResWhisper, err.Error())
 	}