From e408550d767b9c67fd064656b37fd0d2c5b30f78 Mon Sep 17 00:00:00 2001 From: Ken Hibino Date: Tue, 2 Mar 2021 21:57:34 -0800 Subject: [PATCH] Update base.EncodeMessage to return byte slice --- internal/base/base.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/internal/base/base.go b/internal/base/base.go index f30416b..00f29be 100644 --- a/internal/base/base.go +++ b/internal/base/base.go @@ -197,12 +197,11 @@ type TaskMessage struct { UniqueKey string } -// EncodeMessage marshals the given task message in JSON and returns an encoded string. -// TODO: Should return []byte instead of string -func EncodeMessage(msg *TaskMessage) (string, error) { +// EncodeMessage marshals the given task message and returns an encoded bytes. +func EncodeMessage(msg *TaskMessage) ([]byte, error) { payload, err := json.Marshal(msg.Payload) if err != nil { - return "", err + return nil, err } pbmsg := pb.TaskMessage{ Type: msg.Type, @@ -216,11 +215,7 @@ func EncodeMessage(msg *TaskMessage) (string, error) { Deadline: msg.Deadline, UniqueKey: msg.UniqueKey, } - b, err := proto.Marshal(&pbmsg) - if err != nil { - return "", err - } - return string(b), nil + return proto.Marshal(&pbmsg) } // DecodeMessage unmarshals the given encoded string and returns a decoded task message.