chore: improving type namings (#61)

This commit is contained in:
gabrielmer 2025-04-08 14:14:22 +03:00 committed by GitHub
parent e8588762f4
commit 8193867e44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 19 deletions

View File

@ -15,7 +15,7 @@ type Envelope struct {
hash MessageHash hash MessageHash
} }
type tmpWakuMessageJson struct { type wakuMessage struct {
Payload []byte `json:"payload,omitempty"` Payload []byte `json:"payload,omitempty"`
ContentTopic string `json:"contentTopic,omitempty"` ContentTopic string `json:"contentTopic,omitempty"`
Version *uint32 `json:"version,omitempty"` Version *uint32 `json:"version,omitempty"`
@ -25,32 +25,32 @@ type tmpWakuMessageJson struct {
RateLimitProof []byte `json:"proof,omitempty"` RateLimitProof []byte `json:"proof,omitempty"`
} }
type tmpEnvelopeStruct struct { type wakuEnvelope struct {
WakuMessage tmpWakuMessageJson `json:"wakuMessage"` WakuMessage wakuMessage `json:"wakuMessage"`
PubsubTopic string `json:"pubsubTopic"` PubsubTopic string `json:"pubsubTopic"`
MessageHash MessageHash `json:"messageHash"` MessageHash MessageHash `json:"messageHash"`
} }
// NewEnvelope creates a new Envelope from a json string generated in nwaku // NewEnvelope creates a new Envelope from a json string generated in nwaku
func NewEnvelope(jsonEventStr string) (*Envelope, error) { func NewEnvelope(jsonEventStr string) (*Envelope, error) {
tmpEnvelopeStruct := tmpEnvelopeStruct{} wakuEnvelope := wakuEnvelope{}
err := json.Unmarshal([]byte(jsonEventStr), &tmpEnvelopeStruct) err := json.Unmarshal([]byte(jsonEventStr), &wakuEnvelope)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &Envelope{ return &Envelope{
msg: &pb.WakuMessage{ msg: &pb.WakuMessage{
Payload: tmpEnvelopeStruct.WakuMessage.Payload, Payload: wakuEnvelope.WakuMessage.Payload,
ContentTopic: tmpEnvelopeStruct.WakuMessage.ContentTopic, ContentTopic: wakuEnvelope.WakuMessage.ContentTopic,
Version: tmpEnvelopeStruct.WakuMessage.Version, Version: wakuEnvelope.WakuMessage.Version,
Timestamp: tmpEnvelopeStruct.WakuMessage.Timestamp, Timestamp: wakuEnvelope.WakuMessage.Timestamp,
Meta: tmpEnvelopeStruct.WakuMessage.Meta, Meta: wakuEnvelope.WakuMessage.Meta,
Ephemeral: tmpEnvelopeStruct.WakuMessage.Ephemeral, Ephemeral: wakuEnvelope.WakuMessage.Ephemeral,
RateLimitProof: tmpEnvelopeStruct.WakuMessage.RateLimitProof, RateLimitProof: wakuEnvelope.WakuMessage.RateLimitProof,
}, },
topic: tmpEnvelopeStruct.PubsubTopic, topic: wakuEnvelope.PubsubTopic,
hash: tmpEnvelopeStruct.MessageHash, hash: wakuEnvelope.MessageHash,
}, nil }, nil
} }

View File

@ -14,9 +14,9 @@ type StoreQueryRequest struct {
} }
type StoreMessageResponse struct { type StoreMessageResponse struct {
WakuMessage *tmpWakuMessageJson `json:"message"` WakuMessage *wakuMessage `json:"message"`
PubsubTopic string `json:"pubsubTopic"` PubsubTopic string `json:"pubsubTopic"`
MessageHash MessageHash `json:"messageHash"` MessageHash MessageHash `json:"messageHash"`
} }
type StoreQueryResponse struct { type StoreQueryResponse struct {