Merge remote-tracking branch 'origin/master' into Fix_store_format

waku/common/envelope.go

@@ -31,16 +31,15 @@ type wakuEnvelope struct {
 	MessageHash MessageHash `json:"messageHash"`
 }
 
-// NewEnvelope creates a new Envelope from a json string generated in nwaku
+// UnmarshalJSON implements the json.Unmarshaler interface
-func NewEnvelope(jsonEventStr string) (*Envelope, error) {
+func (e *Envelope) UnmarshalJSON(input []byte) error {
 	wakuEnvelope := wakuEnvelope{}
-	err := json.Unmarshal([]byte(jsonEventStr), &wakuEnvelope)
+	err := json.Unmarshal(input, &wakuEnvelope)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	return &Envelope{
+	e.msg = &pb.WakuMessage{
-		msg: &pb.WakuMessage{
 		Payload:        wakuEnvelope.WakuMessage.Payload,
 		ContentTopic:   wakuEnvelope.WakuMessage.ContentTopic,
 		Version:        wakuEnvelope.WakuMessage.Version,
@@ -48,10 +47,11 @@ func NewEnvelope(jsonEventStr string) (*Envelope, error) {
 		Meta:           wakuEnvelope.WakuMessage.Meta,
 		Ephemeral:      wakuEnvelope.WakuMessage.Ephemeral,
 		RateLimitProof: wakuEnvelope.WakuMessage.RateLimitProof,
-		},
+	}
-		topic: wakuEnvelope.PubsubTopic,
+	e.topic = wakuEnvelope.PubsubTopic
-		hash:  wakuEnvelope.MessageHash,
+	e.hash = wakuEnvelope.MessageHash
-	}, nil
+
+	return nil
 }
 
 func (e *Envelope) Message() *pb.WakuMessage {

waku/nwaku.go

@@ -480,12 +480,14 @@ func (n *WakuNode) OnEvent(eventStr string) {
 }
 
 func (n *WakuNode) parseMessageEvent(eventStr string) {
-	envelope, err := common.NewEnvelope(eventStr)
+	var envelope common.Envelope
+	err := json.Unmarshal([]byte(eventStr), &envelope)
 	if err != nil {
 		Error("could not parse message %v", err)
+		return
 	}
 	select {
-	case n.MsgChan <- *envelope:
+	case n.MsgChan <- envelope:
 	default:
 		Warn("Can't deliver message to subscription, MsgChan is full")
 	}