Move waku.nim from waku/factory to under waku/

apps/liteprotocoltester/liteprotocoltester.nim

@@ -14,7 +14,7 @@ import
   logos_delivery/waku/[
     common/enr,
     common/logging,
-    factory/waku as waku_factory,
+    waku as waku_factory,
     waku_node,
     node/waku_metrics,
     node/peer_manager,

apps/wakunode2/wakunode2.nim

@@ -11,7 +11,7 @@ import
   ../../tools/[rln_keystore_generator/rln_keystore_generator, confutils/cli_args],
   logos_delivery/waku/[
     common/logging,
-    factory/waku,
+    waku,
     node/health_monitor,
     rest_api/endpoint/builder as rest_server_builder,
     waku_core/message/default_values,

examples/wakustealthcommitments/node_spec.nim

@@ -1,7 +1,7 @@
 {.push raises: [].}
 
 import tools/confutils/cli_args
-import logos_delivery/waku/[common/logging, factory/[waku, networks_config]]
+import logos_delivery/waku/[common/logging, waku, factory/networks_config]
 import
   std/[options, strutils, os, sequtils],
   chronicles,

library/kernel_api/debug_node_api.nim

@@ -9,7 +9,7 @@ import
   metrics,
   ffi
 import
-  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku,
   logos_delivery/waku/node/waku_node,
   logos_delivery/waku/node/health_monitor,
   library/declare_lib

library/kernel_api/discovery_api.nim

@@ -2,7 +2,7 @@ import logos_delivery/waku/compat/option_valueor
 import std/json
 import chronos, chronicles, results, strutils, libp2p/multiaddress, ffi
 import
-  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku,
   logos_delivery/waku/discovery/waku_dnsdisc,
   logos_delivery/waku/discovery/waku_discv5,
   logos_delivery/waku/waku_core/peers,

library/kernel_api/node_lifecycle_api.nim

@@ -5,7 +5,7 @@ import chronos, chronicles, results, confutils, confutils/std/net, ffi
 import
   logos_delivery/waku/node/peer_manager/peer_manager,
   tools/confutils/cli_args,
-  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku,
   logos_delivery/waku/factory/node_factory,
   logos_delivery/waku/factory/app_callbacks,
   logos_delivery/waku/rest_api/endpoint/builder,

library/kernel_api/peer_manager_api.nim

@@ -2,7 +2,7 @@ import logos_delivery/waku/compat/option_valueor
 import std/[sequtils, strutils, tables]
 import chronicles, chronos, results, options, json, ffi
 import
-  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku,
   logos_delivery/waku/node/waku_node,
   logos_delivery/waku/node/peer_manager,
   library/declare_lib

library/kernel_api/ping_api.nim

@@ -2,7 +2,7 @@ import std/[json, strutils]
 import chronos, results, ffi
 import libp2p/[protocols/ping, switch, multiaddress, multicodec]
 import
-  logos_delivery/waku/[factory/waku, waku_core/peers, node/waku_node],
+  logos_delivery/waku/[waku, waku_core/peers, node/waku_node],
   library/declare_lib
 
 proc waku_ping_peer(

library/kernel_api/protocols/filter_api.nim

@@ -4,7 +4,7 @@ import chronicles, chronos, results, ffi
 import
   logos_delivery/waku/waku_filter_v2/client,
   logos_delivery/waku/waku_core/message/message,
-  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku,
   logos_delivery/waku/waku_relay,
   logos_delivery/waku/waku_filter_v2/common,
   logos_delivery/waku/waku_core/subscription/push_handler,

library/kernel_api/protocols/lightpush_api.nim

@@ -4,7 +4,7 @@ import chronicles, chronos, results, ffi
 import
   logos_delivery/waku/waku_core/message/message,
   logos_delivery/waku/waku_core/codecs,
-  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku,
   logos_delivery/waku/waku_core/message,
   logos_delivery/waku/waku_core/topics/pubsub_topic,
   logos_delivery/waku/waku_lightpush_legacy/client,

library/kernel_api/protocols/relay_api.nim

@@ -3,7 +3,8 @@ import std/[net, sequtils, strutils, json], strformat
 import chronicles, chronos, stew/byteutils, results, ffi
 import
   logos_delivery/waku/waku_core/message/message,
-  logos_delivery/waku/factory/[validator_signed, waku],
+  logos_delivery/waku/factory/validator_signed,
+  logos_delivery/waku/waku,
   tools/confutils/cli_args,
   logos_delivery/waku/waku_core/message,
   logos_delivery/waku/waku_core/topics/pubsub_topic,

library/kernel_api/protocols/store_api.nim

@@ -2,7 +2,7 @@ import logos_delivery/waku/compat/option_valueor
 import std/[json, sugar, strutils, options]
 import chronos, chronicles, results, stew/byteutils, ffi
 import
-  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku,
   library/utils,
   logos_delivery/waku/waku_core/peers,
   logos_delivery/waku/waku_core/message/digest,

library/liblogosdelivery.nim

@@ -6,7 +6,7 @@ import
   logos_delivery/waku/waku_core/topics/pubsub_topic,
   logos_delivery/waku/waku_relay,
   logos_delivery,
-  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku,
   logos_delivery/waku/node/waku_node,
   logos_delivery/waku/node/health_monitor/health_status,
   ../logos_delivery/waku/factory/app_callbacks,

library/logos_delivery_api/messaging_api.nim

@@ -3,7 +3,7 @@ import chronos, results, ffi
 import stew/byteutils
 import
   logos_delivery/waku/common/base64,
-  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku,
   logos_delivery/waku/waku_core/topics/content_topic,
   logos_delivery/waku/api/[api, types],
   ../declare_lib

logos_delivery/logos_delivery.nim

@@ -13,7 +13,7 @@ import results, chronos, chronicles
 
 import logos_delivery/waku/api
 export api
-import logos_delivery/waku/factory/waku
+import logos_delivery/waku/waku
 export waku
 import logos_delivery/messaging/messaging_client
 export messaging_client

logos_delivery/waku/api/api.nim

@@ -3,7 +3,7 @@ import std/[net, options]
 
 import chronicles, chronos, libp2p/peerid, results
 
-import logos_delivery/waku/factory/waku
+import logos_delivery/waku/waku
 import logos_delivery/waku/[requests/health_requests, waku_core, waku_node]
 import logos_delivery/waku/node/subscription_manager
 import libp2p/peerid

logos_delivery/waku/waku.nim

@@ -49,8 +49,8 @@ import
     factory/app_callbacks,
     persistency/persistency,
   ],
-  ./waku_conf,
-  ./waku_state_info
+  ./factory/waku_conf,
+  ./factory/waku_state_info
 
 logScope:
   topics = "wakunode waku"

tests/waku_discv5/test_waku_discv5.nim

@@ -21,7 +21,7 @@ import
     discovery/waku_discv5,
     waku_enr/capabilities,
     factory/conf_builder/conf_builder,
-    factory/waku,
+    waku,
     waku_node,
     node/peer_manager,
   ],

tests/wakunode2/test_app.nim

@@ -10,7 +10,7 @@ import
   tests/testlib/[wakucore, wakunode],
   logos_delivery/waku/factory/conf_builder/conf_builder
 
-include logos_delivery/waku/factory/waku, logos_delivery/waku/common/enr/typed_record
+include logos_delivery/waku/waku, logos_delivery/waku/common/enr/typed_record
 
 suite "Wakunode2 - Waku":
   test "compilation version should be reported":