WIP fixing import after folder moves, wakunode2, tests compiling

2026-08-04 10:53:19 +00:00 · 2026-06-05 16:04:35 +02:00 · 2026-06-05 16:04:35 +02:00 · c84cb804eb
commit c84cb804eb
parent 62b6259a19
31 changed files with 86 additions and 81 deletions
--- a/7
+++ b/7
@ -24,9 +24,14 @@ export PATH := $(HOME)/.nimble/bin:$(PATH)
 # NIM binary location
 NIM_BINARY := $(shell which nim 2>/dev/null)
 NPH := $(HOME)/.nimble/bin/nph
+
+NIMBLE := nimble
+ifeq ($(detected_OS),Windows)
 # Resolve nimble via PATH (Windows has no $(HOME)/.nimble/bin); --useSystemNim
 # reuses the nim on PATH so nimble never re-clones the locked nim.
-NIMBLE := nimble --useSystemNim
+	NIMBLE := nimble --useSystemNim
+endif
+
 NIMBLEDEPS_STAMP := nimbledeps/.nimble-setup

 # Compilation parameters
--- a/examples/api_example/api_example.nim
+++ b/examples/api_example/api_example.nim
@ -1,6 +1,6 @@
 import std/options
 import chronos, results, confutils, confutils/defs
-import waku
+import logos_delivery

 type CliArgs = object
  ethRpcEndpoint* {.
--- a/examples/filter_subscriber.nim
+++ b/examples/filter_subscriber.nim
@ -9,7 +9,7 @@ import
  eth/p2p/discoveryv5/enr

 import
-  waku/[
+  logos_delivery/waku/[
    common/logging,
    node/peer_manager,
    waku_core,
--- a/examples/lightpush_mix/lightpush_publisher_mix.nim
+++ b/examples/lightpush_mix/lightpush_publisher_mix.nim
@ -16,7 +16,7 @@ import
  metrics/chronos_httpserver

 import
-  waku/[
+  logos_delivery/waku/[
    common/logging,
    node/peer_manager,
    waku_core,
--- a/examples/lightpush_mix/lightpush_publisher_mix_config.nim
+++ b/examples/lightpush_mix/lightpush_publisher_mix_config.nim
@ -5,7 +5,7 @@ import
  libp2p/multicodec,
  nimcrypto/utils as ncrutils

-import waku/waku_mix
+import logos_delivery/waku/waku_mix

 type LightPushMixConf* = object
  destPeerAddr* {.desc: "Destination peer address with peerId.", name: "dp-addr".}:
--- a/examples/lightpush_publisher.nim
+++ b/examples/lightpush_publisher.nim
@ -10,7 +10,7 @@ import
  eth/p2p/discoveryv5/enr

 import
-  waku/[
+  logos_delivery/waku/[
    common/logging,
    node/peer_manager,
    waku_core,
--- a/examples/publisher.nim
+++ b/examples/publisher.nim
@ -9,7 +9,7 @@ import
  eth/p2p/discoveryv5/enr

 import
-  waku/[
+  logos_delivery/waku/[
    common/logging,
    node/peer_manager,
    waku_core,
--- a/examples/subscriber.nim
+++ b/examples/subscriber.nim
@ -9,7 +9,7 @@ import
  eth/p2p/discoveryv5/enr

 import
-  waku/[
+  logos_delivery/waku/[
    common/logging,
    node/peer_manager,
    waku_core,
--- a/examples/wakustealthcommitments/node_spec.nim
+++ b/examples/wakustealthcommitments/node_spec.nim
@ -1,7 +1,7 @@
 {.push raises: [].}

 import tools/confutils/cli_args
-import waku/[common/logging, factory/[waku, networks_config]]
+import logos_delivery/waku/[common/logging, factory/[waku, networks_config]]
 import
  std/[options, strutils, os, sequtils],
  chronicles,
--- a/examples/wakustealthcommitments/stealth_commitment_protocol.nim
+++ b/examples/wakustealthcommitments/stealth_commitment_protocol.nim
@ -2,7 +2,7 @@

 import
  results,
-  waku/[common/logging, waku_node, waku_rln_relay],
+  logos_delivery/waku/[common/logging, waku_node, waku_rln_relay],
  ./erc_5564_interface as StealthCommitmentFFI,
  ./node_spec,
  ./wire_spec
--- a/examples/wakustealthcommitments/wire_spec.nim
+++ b/examples/wakustealthcommitments/wire_spec.nim
@ -1,7 +1,7 @@
 import std/[times, options]
 import confutils, chronicles, chronos, results

-import waku/[waku_core, common/protobuf]
+import logos_delivery/waku/[waku_core, common/protobuf]
 import libp2p/protobuf/minprotobuf

 export
--- a/liblogosdelivery/declare_lib.nim
+++ b/liblogosdelivery/declare_lib.nim
@ -1,6 +1,6 @@
 import ffi
 import std/locks
-import waku/factory/waku
+import logos_delivery/waku/factory/waku

 declareLibrary("logosdelivery")

--- a/liblogosdelivery/liblogosdelivery.nim
+++ b/liblogosdelivery/liblogosdelivery.nim
@ -1,6 +1,6 @@
 import std/[atomics, options]
 import chronicles, chronos, chronos/threadsync, ffi
-import waku/factory/waku, waku/node/waku_node, ./declare_lib
+import logos_delivery/waku/factory/waku, logos_delivery/waku/node/waku_node, ./declare_lib

 ################################################################################
 ## Include different APIs, i.e. all procs with {.ffi.} pragma
--- a/liblogosdelivery/logos_delivery_api/debug_api.nim
+++ b/liblogosdelivery/logos_delivery_api/debug_api.nim
@ -1,5 +1,5 @@
 import std/[json, strutils]
-import waku/factory/waku_state_info
+import logos_delivery/waku/factory/waku_state_info
 import tools/confutils/[cli_args, config_option_meta]

 proc logosdelivery_get_available_node_info_ids(
--- a/liblogosdelivery/logos_delivery_api/messaging_api.nim
+++ b/liblogosdelivery/logos_delivery_api/messaging_api.nim
@ -2,10 +2,10 @@ import std/[json]
 import chronos, results, ffi
 import stew/byteutils
 import
-  waku/common/base64,
-  waku/factory/waku,
-  waku/waku_core/topics/content_topic,
-  waku/api/[api, types],
+  logos_delivery/waku/common/base64,
+  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku_core/topics/content_topic,
+  logos_delivery/waku/api/[api, types],
  ../declare_lib

 proc logosdelivery_subscribe(
--- a/liblogosdelivery/logos_delivery_api/node_api.nim
+++ b/liblogosdelivery/logos_delivery_api/node_api.nim
@ -1,10 +1,10 @@
 import std/[json, strutils, tables]
 import chronos, chronicles, results, confutils, confutils/std/net, ffi
 import
-  waku/factory/waku,
-  waku/node/waku_node,
-  waku/api/[api, types],
-  waku/events/[message_events, health_events],
+  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/node/waku_node,
+  logos_delivery/waku/api/[api, types],
+  logos_delivery/waku/events/[message_events, health_events],
  tools/confutils/cli_args,
  ../declare_lib,
  ../json_event
--- a/library/declare_lib.nim
+++ b/library/declare_lib.nim
@ -1,5 +1,5 @@
 import ffi
-import waku/factory/waku
+import logos_delivery/waku/factory/waku

 declareLibrary("waku")

--- a/library/events/json_connection_change_event.nim
+++ b/library/events/json_connection_change_event.nim
@ -1,6 +1,6 @@
 import system, std/json, libp2p/[connmanager, peerid]

-import ../../waku/common/base64, ./json_base_event
+import ../../logos_delivery/waku/common/base64, ./json_base_event

 type JsonConnectionChangeEvent* = ref object of JsonEvent
  peerId*: string
--- a/library/events/json_connection_status_change_event.nim
+++ b/library/events/json_connection_status_change_event.nim
@ -2,7 +2,7 @@

 import system, std/json
 import ./json_base_event
-import ../../waku/api/types
+import ../../logos_delivery/waku/api/types

 type JsonConnectionStatusChangeEvent* = ref object of JsonEvent
  status*: ConnectionStatus
--- a/library/events/json_message_event.nim
+++ b/library/events/json_message_event.nim
@ -1,9 +1,9 @@
 import system, results, std/json, std/strutils
 import stew/byteutils
 import
-  ../../waku/common/base64,
-  ../../waku/waku_core/message,
-  ../../waku/waku_core/message/message,
+  ../../logos_delivery/waku/common/base64,
+  ../../logos_delivery/waku/waku_core/message,
+  ../../logos_delivery/waku/waku_core/message/message,
  ../utils,
  ./json_base_event

--- a/library/events/json_topic_health_change_event.nim
+++ b/library/events/json_topic_health_change_event.nim
@ -1,7 +1,7 @@
 import system, results, std/json
 import stew/byteutils
-import ../../waku/common/base64, ./json_base_event
-import ../../waku/waku_relay
+import ../../logos_delivery/waku/common/base64, ./json_base_event
+import ../../logos_delivery/waku/waku_relay

 type JsonTopicHealthChangeEvent* = ref object of JsonEvent
  pubsubTopic*: string
--- a/library/kernel_api/debug_node_api.nim
+++ b/library/kernel_api/debug_node_api.nim
@ -9,7 +9,7 @@ import
  metrics,
  ffi
 import
-  waku/factory/waku, waku/node/waku_node, waku/node/health_monitor, library/declare_lib
+  logos_delivery/waku/factory/waku, logos_delivery/waku/node/waku_node, logos_delivery/waku/node/health_monitor, library/declare_lib

 proc getMultiaddresses(node: WakuNode): seq[string] =
  return node.info().listenAddresses
--- a/library/kernel_api/discovery_api.nim
+++ b/library/kernel_api/discovery_api.nim
@ -1,11 +1,11 @@
 import std/json
 import chronos, chronicles, results, strutils, libp2p/multiaddress, ffi
 import
-  waku/factory/waku,
-  waku/discovery/waku_dnsdisc,
-  waku/discovery/waku_discv5,
-  waku/waku_core/peers,
-  waku/waku_node,
+  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/discovery/waku_dnsdisc,
+  logos_delivery/waku/discovery/waku_discv5,
+  logos_delivery/waku/waku_core/peers,
+  logos_delivery/waku/waku_node,
  library/declare_lib

 proc retrieveBootstrapNodes(
--- a/library/kernel_api/node_lifecycle_api.nim
+++ b/library/kernel_api/node_lifecycle_api.nim
@ -2,12 +2,12 @@ import std/[options, json, strutils, net]
 import chronos, chronicles, results, confutils, confutils/std/net, ffi

 import
-  waku/node/peer_manager/peer_manager,
+  logos_delivery/waku/node/peer_manager/peer_manager,
  tools/confutils/cli_args,
-  waku/factory/waku,
-  waku/factory/node_factory,
-  waku/factory/app_callbacks,
-  waku/rest_api/endpoint/builder,
+  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/factory/node_factory,
+  logos_delivery/waku/factory/app_callbacks,
+  logos_delivery/waku/rest_api/endpoint/builder,
  library/declare_lib

 proc createWaku(
--- a/library/kernel_api/peer_manager_api.nim
+++ b/library/kernel_api/peer_manager_api.nim
@ -1,6 +1,6 @@
 import std/[sequtils, strutils, tables]
 import chronicles, chronos, results, options, json, ffi
-import waku/factory/waku, waku/node/waku_node, waku/node/peer_manager, ../declare_lib
+import logos_delivery/waku/factory/waku, logos_delivery/waku/node/waku_node, logos_delivery/waku/node/peer_manager, ../declare_lib

 type PeerInfo = object
  protocols: seq[string]
--- a/library/kernel_api/ping_api.nim
+++ b/library/kernel_api/ping_api.nim
@ -1,7 +1,7 @@
 import std/[json, strutils]
 import chronos, results, ffi
 import libp2p/[protocols/ping, switch, multiaddress, multicodec]
-import waku/[factory/waku, waku_core/peers, node/waku_node], library/declare_lib
+import logos_delivery/waku/[factory/waku, waku_core/peers, node/waku_node], library/declare_lib

 proc waku_ping_peer(
    ctx: ptr FFIContext[Waku],
--- a/library/kernel_api/protocols/filter_api.nim
+++ b/library/kernel_api/protocols/filter_api.nim
@ -1,16 +1,16 @@
 import options, std/[strutils, sequtils]
 import chronicles, chronos, results, ffi
 import
-  waku/waku_filter_v2/client,
-  waku/waku_core/message/message,
-  waku/factory/waku,
-  waku/waku_relay,
-  waku/waku_filter_v2/common,
-  waku/waku_core/subscription/push_handler,
-  waku/node/peer_manager/peer_manager,
-  waku/waku_node,
-  waku/waku_core/topics/pubsub_topic,
-  waku/waku_core/topics/content_topic,
+  logos_delivery/waku/waku_filter_v2/client,
+  logos_delivery/waku/waku_core/message/message,
+  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku_relay,
+  logos_delivery/waku/waku_filter_v2/common,
+  logos_delivery/waku/waku_core/subscription/push_handler,
+  logos_delivery/waku/node/peer_manager/peer_manager,
+  logos_delivery/waku/waku_node,
+  logos_delivery/waku/waku_core/topics/pubsub_topic,
+  logos_delivery/waku/waku_core/topics/content_topic,
  library/events/json_message_event,
  library/declare_lib

--- a/library/kernel_api/protocols/lightpush_api.nim
+++ b/library/kernel_api/protocols/lightpush_api.nim
@ -1,13 +1,13 @@
 import options, std/[json, strformat]
 import chronicles, chronos, results, ffi
 import
-  waku/waku_core/message/message,
-  waku/waku_core/codecs,
-  waku/factory/waku,
-  waku/waku_core/message,
-  waku/waku_core/topics/pubsub_topic,
-  waku/waku_lightpush_legacy/client,
-  waku/node/peer_manager/peer_manager,
+  logos_delivery/waku/waku_core/message/message,
+  logos_delivery/waku/waku_core/codecs,
+  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/waku_core/message,
+  logos_delivery/waku/waku_core/topics/pubsub_topic,
+  logos_delivery/waku/waku_lightpush_legacy/client,
+  logos_delivery/waku/node/peer_manager/peer_manager,
  library/events/json_message_event,
  library/declare_lib

--- a/library/kernel_api/protocols/relay_api.nim
+++ b/library/kernel_api/protocols/relay_api.nim
@ -1,15 +1,15 @@
 import std/[net, sequtils, strutils, json], strformat
 import chronicles, chronos, stew/byteutils, results, ffi
 import
-  waku/waku_core/message/message,
-  waku/factory/[validator_signed, waku],
+  logos_delivery/waku/waku_core/message/message,
+  logos_delivery/waku/factory/[validator_signed, waku],
  tools/confutils/cli_args,
-  waku/waku_core/message,
-  waku/waku_core/topics/pubsub_topic,
-  waku/waku_core/topics,
-  waku/node/waku_node/relay,
-  waku/waku_relay/protocol,
-  waku/node/peer_manager,
+  logos_delivery/waku/waku_core/message,
+  logos_delivery/waku/waku_core/topics/pubsub_topic,
+  logos_delivery/waku/waku_core/topics,
+  logos_delivery/waku/node/waku_node/relay,
+  logos_delivery/waku/waku_relay/protocol,
+  logos_delivery/waku/node/peer_manager,
  library/events/json_message_event,
  library/declare_lib

--- a/library/kernel_api/protocols/store_api.nim
+++ b/library/kernel_api/protocols/store_api.nim
@ -1,13 +1,13 @@
 import std/[json, sugar, strutils, options]
 import chronos, chronicles, results, stew/byteutils, ffi
 import
-  waku/factory/waku,
+  logos_delivery/waku/factory/waku,
  library/utils,
-  waku/waku_core/peers,
-  waku/waku_core/message/digest,
-  waku/waku_store/common,
-  waku/waku_store/client,
-  waku/common/paging,
+  logos_delivery/waku/waku_core/peers,
+  logos_delivery/waku/waku_core/message/digest,
+  logos_delivery/waku/waku_store/common,
+  logos_delivery/waku/waku_store/client,
+  logos_delivery/waku/common/paging,
  library/declare_lib

 func fromJsonNode(jsonContent: JsonNode): Result[StoreQueryRequest, string] =
--- a/library/libwaku.nim
+++ b/library/libwaku.nim
@ -1,17 +1,17 @@
 import std/[atomics, options, atomics, macros]
 import chronicles, chronos, chronos/threadsync, ffi
 import
-  waku/waku_core/message/message,
-  waku/waku_core/topics/pubsub_topic,
-  waku/waku_relay,
+  logos_delivery/waku/waku_core/message/message,
+  logos_delivery/waku/waku_core/topics/pubsub_topic,
+  logos_delivery/waku/waku_relay,
  ./events/json_message_event,
  ./events/json_topic_health_change_event,
  ./events/json_connection_change_event,
  ./events/json_connection_status_change_event,
-  ../waku/factory/app_callbacks,
-  waku/factory/waku,
-  waku/node/waku_node,
-  waku/node/health_monitor/health_status,
+  ../logos_delivery/waku/factory/app_callbacks,
+  logos_delivery/waku/factory/waku,
+  logos_delivery/waku/node/waku_node,
+  logos_delivery/waku/node/health_monitor/health_status,
  ./declare_lib

 ################################################################################