diff --git a/pkg/api/message/v1/service.go b/pkg/api/message/v1/service.go index 0b9d81fd..0f92ae3f 100644 --- a/pkg/api/message/v1/service.go +++ b/pkg/api/message/v1/service.go @@ -394,8 +394,8 @@ func buildEnvelope(msg *wakupb.WakuMessage) *proto.Envelope { } } -func isValidSubscribeAllTopic(topic string) bool { - return strings.HasPrefix(topic, validXMTPTopicPrefix) +func isValidSubscribeAllTopic(contentTopic string) bool { + return strings.HasPrefix(contentTopic, validXMTPTopicPrefix) || topic.IsMLSV1(contentTopic) } func fromWakuTimestamp(ts int64) uint64 { diff --git a/pkg/api/server.go b/pkg/api/server.go index e4aaf3fe..267804a2 100644 --- a/pkg/api/server.go +++ b/pkg/api/server.go @@ -165,7 +165,6 @@ func (s *Server) startGRPC() error { wakuMsg := wakuEnv.Message() if topic.IsMLSV1(wakuMsg.ContentTopic) { - s.Log.Info("handling waku relay message in mlsv1 service", zap.String("topic", wakuMsg.ContentTopic)) if s.mlsv1 != nil { err := s.mlsv1.HandleIncomingWakuRelayMessage(wakuEnv.Message()) if err != nil { diff --git a/pkg/mls/api/v1/service.go b/pkg/mls/api/v1/service.go index 81ec3b23..c6779139 100644 --- a/pkg/mls/api/v1/service.go +++ b/pkg/mls/api/v1/service.go @@ -363,7 +363,6 @@ func (s *Service) QueryWelcomeMessages(ctx context.Context, req *mlsv1.QueryWelc func (s *Service) SubscribeGroupMessages(req *mlsv1.SubscribeGroupMessagesRequest, stream mlsv1.MlsApi_SubscribeGroupMessagesServer) error { log := s.log.Named("subscribe-group-messages").With(zap.Int("filters", len(req.Filters))) log.Info("subscription started") - defer log.Info("subscription ended") // Send a header (any header) to fix an issue with Tonic based GRPC clients. // See: https://github.com/xmtp/libxmtp/pull/58 _ = stream.SendHeader(metadata.Pairs("subscribed", "true")) @@ -371,9 +370,7 @@ func (s *Service) SubscribeGroupMessages(req *mlsv1.SubscribeGroupMessagesReques var streamLock sync.Mutex for _, filter := range req.Filters { natsSubject := buildNatsSubjectForGroupMessages(filter.GroupId) - log.Info("subscribing to nats subject", zap.String("subject", natsSubject), zap.String("group_id", hex.EncodeToString(filter.GroupId))) sub, err := s.nc.Subscribe(natsSubject, func(natsMsg *nats.Msg) { - log.Info("received message from nats") var msg mlsv1.GroupMessage err := pb.Unmarshal(natsMsg.Data, &msg) if err != nil { @@ -418,7 +415,6 @@ func (s *Service) SubscribeWelcomeMessages(req *mlsv1.SubscribeWelcomeMessagesRe for _, filter := range req.Filters { natsSubject := buildNatsSubjectForWelcomeMessages(filter.InstallationKey) sub, err := s.nc.Subscribe(natsSubject, func(natsMsg *nats.Msg) { - log.Info("received message from nats") var msg mlsv1.WelcomeMessage err := pb.Unmarshal(natsMsg.Data, &msg) if err != nil {