Make liblogosdelivery and wakunode2 compile, remove waku/api.nim as it was just a import orchestrator

library/logos_delivery_api/messaging_api.nim

@@ -5,7 +5,7 @@ import
   logos_delivery/waku/common/base64,
   logos_delivery/waku/waku,
   logos_delivery/waku/waku_core/topics/content_topic,
-  logos_delivery/waku/api/[api, types],
+  logos_delivery/api/types,
   ../declare_lib
 
 proc logosdelivery_subscribe(
@@ -20,7 +20,7 @@ proc logosdelivery_subscribe(
   # ContentTopic is just a string type alias
   let contentTopic = ContentTopic($contentTopicStr)
 
-  (await api.subscribe(ctx.myLib[].waku, contentTopic)).isOkOr:
+  (await ctx.myLib[].messagingClient.subscribe(contentTopic)).isOkOr:
     let errMsg = $error
     return err("Subscribe failed: " & errMsg)
 
@@ -38,7 +38,7 @@ proc logosdelivery_unsubscribe(
   # ContentTopic is just a string type alias
   let contentTopic = ContentTopic($contentTopicStr)
 
-  api.unsubscribe(ctx.myLib[].waku, contentTopic).isOkOr:
+  ctx.myLib[].messagingClient.unsubscribe(contentTopic).isOkOr:
     let errMsg = $error
     return err("Unsubscribe failed: " & errMsg)
 

library/logos_delivery_api/node_api.nim

@@ -3,7 +3,8 @@ import chronos, chronicles, results, ffi
 import
   logos_delivery,
   logos_delivery/waku/node/waku_node,
-  logos_delivery/waku/api/[api, types],
+  logos_delivery/waku/events/message_events,
+  logos_delivery/api/types,
   logos_delivery/waku/events/[message_events, health_events],
   tools/confutils/conf_from_json,
   ../declare_lib,

logos_delivery/api/types.nim

@@ -8,6 +8,8 @@ import logos_delivery/waku/utils/requests as request_utils
 import logos_delivery/waku/waku_core/[topics/content_topic, message/message, time]
 import logos_delivery/waku/requests/requests
 
+export content_topic, message
+
 type
   MessageEnvelope* = object
     contentTopic*: ContentTopic

logos_delivery/logos_delivery.nim

@@ -11,8 +11,6 @@
 
 import results, chronos, chronicles
 
-import logos_delivery/waku/api
-export api
 import logos_delivery/waku/waku
 export waku
 import logos_delivery/messaging/messaging_client
@@ -22,6 +20,8 @@ export reliable_channel_manager
 
 import logos_delivery/waku/factory/waku_conf
 import logos_delivery/waku/factory/app_callbacks
+import tools/confutils/cli_args
+import logos_delivery/waku/node/health_monitor/online_monitor
 
 logScope:
   topics = "logosdelivery"

logos_delivery/waku/api.nim

@@ -1,4 +0,0 @@
-import ./events/message_events
-import tools/confutils/entry_nodes
-
-export entry_nodes, message_events

logos_delivery/waku/waku.nim

@@ -11,6 +11,7 @@ import
   libp2p/wire,
   libp2p/crypto/crypto,
   libp2p/protocols/pubsub/gossipsub,
+  libp2p/protocols/ping,
   libp2p/services/autorelayservice,
   libp2p/services/hpservice,
   libp2p/peerid,
@@ -49,6 +50,9 @@ import
     factory/app_callbacks,
     persistency/persistency,
     factory/validator_signed,
+    waku_lightpush/client,
+    waku_lightpush_legacy/client,
+    waku_store/client,
   ],
   ./factory/waku_conf,
   ./factory/waku_state_info
@@ -59,6 +63,8 @@ logScope:
 # Git version in git describe format (defined at compile time)
 const git_version* {.strdefine.} = "n/a"
 
+const FilterOpTimeout = 5.seconds
+
 type Waku* = ref object
   stateInfo*: WakuStateInfo
   conf*: WakuConf