update serializing

cart-grain.go

@@ -1,98 +1,16 @@
 package main
 
 import (
-	"bufio"
-	"bytes"
-	"encoding/binary"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
 	"net/http"
 	"time"
 
 	"git.tornberg.me/go-cart-actor/git.tornberg.me/go-cart-actor/messages"
 	"github.com/matst80/slask-finder/pkg/index"
-	"google.golang.org/protobuf/proto"
 )
 
-type StorableMessage interface {
-	GetBytes() ([]byte, error)
-	FromReader(io.Reader, *Message) error
-}
-
-type Message struct {
-	Type      uint64
-	TimeStamp *int64
-	Content   interface{}
-}
-
-func (m Message) GetBytes() ([]byte, error) {
-	var b bytes.Buffer
-	var err error
-	w := bufio.NewWriter(&b)
-	bytes := make([]byte, 8)
-	binary.LittleEndian.PutUint64(bytes, m.Type)
-	w.Write(bytes)
-	binary.LittleEndian.PutUint64(bytes, uint64(*m.TimeStamp))
-	w.Write(bytes)
-	var messageBytes []byte
-	if m.Type == 1 {
-		messageBytes, err = proto.Marshal(m.Content.(*messages.AddRequest))
-	} else if m.Type == 2 {
-		messageBytes, err = proto.Marshal(m.Content.(*messages.AddItem))
-	} else {
-		return nil, fmt.Errorf("unknown message type")
-	}
-	if err != nil {
-		return nil, err
-	}
-	binary.LittleEndian.PutUint64(bytes, uint64(len(messageBytes)))
-	w.Write(bytes)
-	w.Write(messageBytes)
-	w.Flush()
-	return b.Bytes(), nil
-}
-
-func (i Message) FromReader(reader io.Reader, m *Message) error {
-
-	bytes := make([]byte, 8)
-	if _, err := reader.Read(bytes); err != nil {
-		return err
-	}
-	m.Type = binary.LittleEndian.Uint64(bytes)
-	if _, err := reader.Read(bytes); err != nil {
-		return err
-	}
-	timestamp := int64(binary.LittleEndian.Uint64(bytes))
-	m.TimeStamp = &timestamp
-	if _, err := reader.Read(bytes); err != nil {
-		return err
-	}
-	messageBytes := make([]byte, binary.LittleEndian.Uint64(bytes))
-	if _, err := reader.Read(messageBytes); err != nil {
-		return err
-	}
-	var err error
-
-	if m.Type == 1 {
-		msg := &messages.AddRequest{}
-		err = proto.Unmarshal(messageBytes, msg)
-		m.Content = msg
-	} else if m.Type == 2 {
-		msg := &messages.AddItem{}
-		err = proto.Unmarshal(messageBytes, msg)
-		m.Content = msg
-	} else {
-		return fmt.Errorf("unknown message type")
-	}
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 type CartItem struct {
 	Sku   string `json:"sku"`
 	Name  string `json:"name"`
@@ -191,14 +109,14 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool, reply *CartGr
 	}
 	var err error
 	switch message.Type {
-	case 1:
+	case AddRequestType:
 		msg, ok := message.Content.(*messages.AddRequest)
 		if !ok {
 			err = fmt.Errorf("invalid content type")
 		} else {
 			return c.AddItem(msg.Sku, reply)
 		}
-	case 2:
+	case AddItemType:
 		msg, ok := message.Content.(*messages.AddItem)
 		if !ok {
 			err = fmt.Errorf("invalid content type")