Merge dc0ebc7142fb9f4841e79c6f262a40977c5efecf into dafdee9f5ffc0460f45307c61fbd8e9832fc3ecd

library/kernel_api/protocols/filter_api.nim

@@ -47,8 +47,10 @@ proc waku_filter_subscribe(
     error "fail filter subscribe", error = errorMsg
     return err(errorMsg)
 
+  let pubsubTopicOpt =
+    if ($pubsubTopic).len > 0: some(PubsubTopic($pubsubTopic)) else: none(PubsubTopic)
   let subFut = ctx.myLib[].node.filterSubscribe(
-    some(PubsubTopic($pubsubTopic)),
+    pubsubTopicOpt,
     ($contentTopics).split(",").mapIt(ContentTopic(it)),
     peer,
   )

library/kernel_api/protocols/lightpush_api.nim

@@ -39,13 +39,15 @@ proc waku_lightpush_publish(
     let errorMsg = "failed to lightpublish message, no suitable remote peers"
     error "PUBLISH failed", error = errorMsg
     return err(errorMsg)
+  let topic =
+    if ($pubsubTopic).len == 0:
+      none(PubsubTopic)
+    else:
+      some(PubsubTopic($pubsubTopic))
 
-  let msgHashHex = (
-    await ctx.myLib[].node.wakuLegacyLightpushClient.publish(
-      $pubsubTopic, msg, peer = peerOpt.get()
-    )
-  ).valueOr:
-    error "PUBLISH failed", error = error
-    return err($error)
+  discard (await ctx.myLib[].node.lightpushPublish(topic, msg, peerOpt)).valueOr:
+    let errorMsg = error.desc.get($error.code.int)
+    error "PUBLISH failed", error = errorMsg
+    return err(errorMsg)
 
-  return ok(msgHashHex)
+  return ok("")

waku/node/kernel_api/lightpush.nim

@@ -246,23 +246,27 @@ proc lightpushPublish*(
     return lighpushErrorResult(
       LightPushErrorCode.SERVICE_NOT_AVAILABLE, "Waku lightpush not available"
     )
-  if mixify and node.wakuMix.isNil():
-    error "failed to publish message using mix as mix protocol is not mounted"
+  var lmixify = mixify
+  if not node.wakuMix.isNil():
+    lmixify = true
+
+  let
+    #[     error "failed to publish message using mix as mix protocol is not mounted"
     return lighpushErrorResult(
       LightPushErrorCode.SERVICE_NOT_AVAILABLE, "Waku lightpush with mix not available"
-    )
-  let toPeer: RemotePeerInfo = peerOpt.valueOr:
-    if not node.wakuLightPush.isNil():
-      RemotePeerInfo.init(node.peerId())
-    elif not node.wakuLightpushClient.isNil():
-      node.peerManager.selectPeer(WakuLightPushCodec).valueOr:
-        let msg = "no suitable remote peers"
-        error "failed to publish message", msg = msg
-        return lighpushErrorResult(LightPushErrorCode.NO_PEERS_TO_RELAY, msg)
-    else:
-      return lighpushErrorResult(
-        LightPushErrorCode.NO_PEERS_TO_RELAY, "no suitable remote peers"
-      )
+    ) ]#
+    toPeer: RemotePeerInfo = peerOpt.valueOr:
+      if not node.wakuLightPush.isNil():
+        RemotePeerInfo.init(node.peerId())
+      elif not node.wakuLightpushClient.isNil():
+        node.peerManager.selectPeer(WakuLightPushCodec).valueOr:
+          let msg = "no suitable remote peers"
+          error "failed to publish message", msg = msg
+          return lighpushErrorResult(LightPushErrorCode.NO_PEERS_TO_RELAY, msg)
+      else:
+        return lighpushErrorResult(
+          LightPushErrorCode.NO_PEERS_TO_RELAY, "no suitable remote peers"
+        )
 
   let pubsubForPublish = pubSubTopic.valueOr:
     if node.wakuAutoSharding.isNone():
@@ -280,4 +284,4 @@ proc lightpushPublish*(
       error "lightpush publish error", error = msg
       return lighpushErrorResult(LightPushErrorCode.INTERNAL_SERVER_ERROR, msg)
 
-  return await lightpushPublishHandler(node, pubsubForPublish, message, toPeer, mixify)
+  return await lightpushPublishHandler(node, pubsubForPublish, message, toPeer, lmixify)