no need to marshal group

Author: afshin

client.go

@@ -220,7 +220,7 @@ func (c *Client) remove(name string) {
 }
 
 func (c *Client) reply(payload []byte) error {
-	dest, req, err := reqUnmarshal(payload)
+	dest, req, err := reqUnmarshal(c.group, payload)
 	if err != nil {
 		return err.(*Error).escalate(errREPL)
 	}

request.go

@@ -14,15 +14,14 @@ import (
 type request struct {
 	Body        []byte              `json:"body,omitempty"`
 	Destination string              `json:"destination"`
-	Group       string              `json:"group"`
 	Handle      string              `json:"handle"`
 	Header      map[string][]string `json:"header"`
 	Method      string              `json:"method"`
 	URL         string              `json:"url"`
 }
 
 func reqMarshal(group, dest, handle string, in *http.Request) ([]byte, error) {
-	out := &request{Group: group}
+	out := &request{}
 	if in.Body != nil {
 		if body, err := ioutil.ReadAll(in.Body); err == nil {
 			out.Body = body
@@ -43,8 +42,8 @@ func reqMarshal(group, dest, handle string, in *http.Request) ([]byte, error) {
 	return append([]byte(group+repl), zip(marshalled)...), nil
 }
 
-func reqUnmarshal(payload []byte) (*destination, *http.Request, error) {
-	unzipped, err := unzip(payload)
+func reqUnmarshal(group string, p []byte) (*destination, *http.Request, error) {
+	unzipped, err := unzip(p)
 	if err != nil {
 		return nil, nil, err.(*Error).escalate(errReqUnmarshal)
 	}
@@ -58,7 +57,7 @@ func reqUnmarshal(payload []byte) (*destination, *http.Request, error) {
 	}
 	out.Header = http.Header(in.Header)
 	dest := new(destination)
-	dest.group = in.Group
+	dest.group = group
 	dest.handle = in.Handle
 	dest.node = in.Destination
 	return dest, out, nil

response.go

@@ -30,10 +30,10 @@ func resMarshal(group string, res *response) []byte {
 	return append([]byte(group+recv), zip(marshalled)...)
 }
 
-func resUnmarshal(payload []byte) (string, *http.Response, error) {
+func resUnmarshal(p []byte) (string, *http.Response, error) {
 	var handle string
 	var res *http.Response
-	unzipped, err := unzip(payload)
+	unzipped, err := unzip(p)
 	if err != nil {
 		return handle, res, err.(*Error).escalate(errResUnmarshal)
 	}

sleuth_test.go

@@ -218,7 +218,7 @@ func TestError(t *testing.T) {
 
 func TestRequestUnmarshalBadJSON(t *testing.T) {
 	payload := zip([]byte("{bad json}"))
-	_, _, err := reqUnmarshal(payload)
+	_, _, err := reqUnmarshal(GROUP, payload)
 	if err == nil {
 		t.Errorf("expected unmarshalReq to fail on bad json")
 		return