diff --git a/apps/chat2bridge/chat2bridge.nim b/apps/chat2bridge/chat2bridge.nim index 9a22572cd..77c9e553e 100644 --- a/apps/chat2bridge/chat2bridge.nim +++ b/apps/chat2bridge/chat2bridge.nim @@ -240,7 +240,7 @@ proc stop*(cmb: Chat2MatterBridge) {.async: (raises: [Exception]).} = {.pop.} # @TODO confutils.nim(775, 17) Error: can raise an unlisted exception: ref IOError when isMainModule: - import waku/common/utils/nat, waku/waku_api/message_cache + import waku/common/utils/nat, waku/rest_api/message_cache let rng = newRng() diff --git a/apps/liteprotocoltester/diagnose_connections.nim b/apps/liteprotocoltester/diagnose_connections.nim index 15c0768f4..d2cc75516 100644 --- a/apps/liteprotocoltester/diagnose_connections.nim +++ b/apps/liteprotocoltester/diagnose_connections.nim @@ -14,7 +14,7 @@ import libp2p/wire import - ../../tools/confutils/cli_args, + tools/confutils/cli_args, waku/[ node/peer_manager, waku_lightpush/common, diff --git a/apps/liteprotocoltester/liteprotocoltester.nim b/apps/liteprotocoltester/liteprotocoltester.nim index 7778183d1..adb1b0f8a 100644 --- a/apps/liteprotocoltester/liteprotocoltester.nim +++ b/apps/liteprotocoltester/liteprotocoltester.nim @@ -11,7 +11,7 @@ import confutils import - ../../tools/confutils/cli_args, + tools/confutils/cli_args, waku/[ common/enr, common/logging, diff --git a/apps/liteprotocoltester/receiver.nim b/apps/liteprotocoltester/receiver.nim index 9792549ca..b62094ec6 100644 --- a/apps/liteprotocoltester/receiver.nim +++ b/apps/liteprotocoltester/receiver.nim @@ -77,7 +77,7 @@ proc maintainSubscription( some(filterPubsubTopic), filterContentTopic, actualFilterPeer ) ).errorOr: - await sleepAsync(subscriptionMaintenanceMs) + await sleepAsync(SubscriptionMaintenanceMs) if noFailedSubscribes > 0: noFailedSubscribes -= 1 notice "subscribe request successful." diff --git a/apps/liteprotocoltester/service_peer_management.nim b/apps/liteprotocoltester/service_peer_management.nim index 053445740..d5cfafef1 100644 --- a/apps/liteprotocoltester/service_peer_management.nim +++ b/apps/liteprotocoltester/service_peer_management.nim @@ -11,7 +11,7 @@ import libp2p/wire import - ../wakunode2/cli_args, + tools/confutils/cli_args, waku/[ common/enr, waku_node, diff --git a/apps/liteprotocoltester/statistics.nim b/apps/liteprotocoltester/statistics.nim index 5ca215b2c..7feebd4cf 100644 --- a/apps/liteprotocoltester/statistics.nim +++ b/apps/liteprotocoltester/statistics.nim @@ -8,6 +8,8 @@ import results, libp2p/peerid +from std/sugar import `=>` + import ./tester_message, ./lpt_metrics type diff --git a/apps/liteprotocoltester/tester_message.nim b/apps/liteprotocoltester/tester_message.nim index eeff7b531..38028e4a7 100644 --- a/apps/liteprotocoltester/tester_message.nim +++ b/apps/liteprotocoltester/tester_message.nim @@ -6,7 +6,7 @@ import json_serialization/std/options, json_serialization/lexer -import ../../waku/waku_api/rest/serdes +import waku/rest_api/endpoint/serdes type ProtocolTesterMessage* = object sender*: string diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim index 86db3fbc4..b50c7113b 100644 --- a/apps/wakunode2/wakunode2.nim +++ b/apps/wakunode2/wakunode2.nim @@ -14,7 +14,7 @@ import common/logging, factory/waku, node/health_monitor, - waku_api/rest/builder as rest_server_builder, + rest_api/endpoint/builder as rest_server_builder, waku_core/message/default_values, ] diff --git a/examples/wakustealthcommitments/node_spec.nim b/examples/wakustealthcommitments/node_spec.nim index 21286340e..d85e83a5b 100644 --- a/examples/wakustealthcommitments/node_spec.nim +++ b/examples/wakustealthcommitments/node_spec.nim @@ -1,6 +1,6 @@ {.push raises: [].} -import ../../apps/wakunode2/cli_args +import tools/confutils/cli_args import waku/[common/logging, factory/[waku, networks_config]] import std/[options, strutils, os, sequtils], diff --git a/library/waku_thread_requests/requests/discovery_request.nim b/library/waku_thread_requests/requests/discovery_request.nim index 6f6780a2f..405483a46 100644 --- a/library/waku_thread_requests/requests/discovery_request.nim +++ b/library/waku_thread_requests/requests/discovery_request.nim @@ -6,7 +6,7 @@ import ../../../waku/discovery/waku_discv5, ../../../waku/waku_core/peers, ../../../waku/node/waku_node, - ../../../waku/node/api, + ../../../waku/node/kernel_api, ../../alloc type DiscoveryMsgType* = enum diff --git a/library/waku_thread_requests/requests/node_lifecycle_request.nim b/library/waku_thread_requests/requests/node_lifecycle_request.nim index 270bdf1ce..aa71ac6bb 100644 --- a/library/waku_thread_requests/requests/node_lifecycle_request.nim +++ b/library/waku_thread_requests/requests/node_lifecycle_request.nim @@ -2,13 +2,15 @@ import std/[options, json, strutils, net] import chronos, chronicles, results, confutils, confutils/std/net import - ../../../waku/node/peer_manager/peer_manager, - ../../../tools/confutils/cli_args, - ../../../waku/factory/waku, - ../../../waku/factory/node_factory, - ../../../waku/factory/networks_config, - ../../../waku/factory/app_callbacks, - ../../../waku/waku_api/rest/builder, + waku/node/peer_manager/peer_manager, + tools/confutils/cli_args, + waku/factory/waku, + waku/factory/node_factory, + waku/factory/networks_config, + waku/factory/app_callbacks, + waku/rest_api/endpoint/builder + +import ../../alloc type NodeLifecycleMsgType* = enum diff --git a/library/waku_thread_requests/requests/protocols/filter_request.nim b/library/waku_thread_requests/requests/protocols/filter_request.nim index c0a99f1f9..cd401d443 100644 --- a/library/waku_thread_requests/requests/protocols/filter_request.nim +++ b/library/waku_thread_requests/requests/protocols/filter_request.nim @@ -8,7 +8,7 @@ import ../../../../waku/waku_core/subscription/push_handler, ../../../../waku/node/peer_manager/peer_manager, ../../../../waku/node/waku_node, - ../../../../waku/node/api, + ../../../../waku/node/kernel_api, ../../../../waku/waku_core/topics/pubsub_topic, ../../../../waku/waku_core/topics/content_topic, ../../../alloc diff --git a/library/waku_thread_requests/requests/protocols/relay_request.nim b/library/waku_thread_requests/requests/protocols/relay_request.nim index 5c0732768..e110f689e 100644 --- a/library/waku_thread_requests/requests/protocols/relay_request.nim +++ b/library/waku_thread_requests/requests/protocols/relay_request.nim @@ -1,16 +1,18 @@ import std/[net, sequtils, strutils] import chronicles, chronos, stew/byteutils, results import - ../../../../waku/waku_core/message/message, - ../../../../waku/factory/[validator_signed, waku], - ../../../../tools/confutils/cli_args, - ../../../../waku/waku_node, - ../../../../waku/waku_core/message, - ../../../../waku/waku_core/time, # Timestamp - ../../../../waku/waku_core/topics/pubsub_topic, - ../../../../waku/waku_core/topics, - ../../../../waku/waku_relay/protocol, - ../../../../waku/node/peer_manager, + waku/waku_core/message/message, + waku/factory/[validator_signed, waku], + tools/confutils/cli_args, + waku/waku_node, + waku/waku_core/message, + waku/waku_core/time, # Timestamp + waku/waku_core/topics/pubsub_topic, + waku/waku_core/topics, + waku/waku_relay/protocol, + waku/node/peer_manager + +import ../../../alloc type RelayMsgType* = enum diff --git a/tests/node/test_wakunode_filter.nim b/tests/node/test_wakunode_filter.nim index 04db575ab..2777b0124 100644 --- a/tests/node/test_wakunode_filter.nim +++ b/tests/node/test_wakunode_filter.nim @@ -12,7 +12,7 @@ import waku_core, node/peer_manager, node/waku_node, - node/api, + node/kernel_api, waku_filter_v2, waku_filter_v2/client, waku_filter_v2/subscriptions, diff --git a/tests/node/test_wakunode_legacy_lightpush.nim b/tests/node/test_wakunode_legacy_lightpush.nim index 9525892a1..a51ba60b9 100644 --- a/tests/node/test_wakunode_legacy_lightpush.nim +++ b/tests/node/test_wakunode_legacy_lightpush.nim @@ -12,7 +12,7 @@ import waku_core, node/peer_manager, node/waku_node, - node/api, + node/kernel_api, waku_lightpush_legacy, waku_lightpush_legacy/common, waku_lightpush_legacy/protocol_metrics, diff --git a/tests/node/test_wakunode_legacy_store.nim b/tests/node/test_wakunode_legacy_store.nim index 1863066bc..bf8003743 100644 --- a/tests/node/test_wakunode_legacy_store.nim +++ b/tests/node/test_wakunode_legacy_store.nim @@ -6,7 +6,7 @@ import waku/[ common/paging, node/waku_node, - node/api, + node/kernel_api, node/peer_manager, waku_core, waku_store_legacy, @@ -446,7 +446,7 @@ suite "Waku Store - End to End - Sorted Archive": await otherServer.start() let otherServerRemotePeerInfo = otherServer.peerInfo.toRemotePeerInfo() - # When making a history query to the first server node + # When making a history query to the first server node let queryResponse = await client.query(historyQuery, serverRemotePeerInfo) # Then the response contains the messages diff --git a/tests/node/test_wakunode_lightpush.nim b/tests/node/test_wakunode_lightpush.nim index 27c3a4d3e..12bfdddd8 100644 --- a/tests/node/test_wakunode_lightpush.nim +++ b/tests/node/test_wakunode_lightpush.nim @@ -12,7 +12,7 @@ import waku_core, node/peer_manager, node/waku_node, - node/api, + node/kernel_api, waku_lightpush, waku_rln_relay, ], diff --git a/tests/node/test_wakunode_peer_exchange.nim b/tests/node/test_wakunode_peer_exchange.nim index 4ebeae4ae..9b0ea4c40 100644 --- a/tests/node/test_wakunode_peer_exchange.nim +++ b/tests/node/test_wakunode_peer_exchange.nim @@ -14,7 +14,7 @@ import import waku/[ waku_node, - node/api, + node/kernel_api, discovery/waku_discv5, waku_peer_exchange, node/peer_manager, diff --git a/tests/node/test_wakunode_peer_manager.nim b/tests/node/test_wakunode_peer_manager.nim index 6b1c2a427..ed58db7fe 100644 --- a/tests/node/test_wakunode_peer_manager.nim +++ b/tests/node/test_wakunode_peer_manager.nim @@ -17,7 +17,7 @@ import waku_core, node/peer_manager, node/waku_node, - node/api, + node/kernel_api, discovery/waku_discv5, waku_filter_v2/common, waku_relay/protocol, diff --git a/tests/node/test_wakunode_relay_rln.nim b/tests/node/test_wakunode_relay_rln.nim index 1acf6b590..9c5c928f0 100644 --- a/tests/node/test_wakunode_relay_rln.nim +++ b/tests/node/test_wakunode_relay_rln.nim @@ -17,7 +17,7 @@ import node/peer_manager, waku_core, waku_node, - node/api, + node/kernel_api, common/error_handling, waku_rln_relay, waku_rln_relay/rln, @@ -514,7 +514,7 @@ suite "Waku RlnRelay - End to End - OnChain": ## Issues ### TreeIndex For some reason the calls to `getWakuRlnConfigOnChain` need to be made with `treeIndex` = 0 and 1, in that order. - But the registration needs to be made with 1 and 2. + But the registration needs to be made with 1 and 2. #### Solutions Requires investigation ### Monkeypatching diff --git a/tests/node/test_wakunode_sharding.nim b/tests/node/test_wakunode_sharding.nim index 945c22eee..eefd8f06e 100644 --- a/tests/node/test_wakunode_sharding.nim +++ b/tests/node/test_wakunode_sharding.nim @@ -16,7 +16,7 @@ import waku_core/topics/sharding, waku_store_legacy/common, node/waku_node, - node/api, + node/kernel_api, common/paging, waku_core, waku_store/common, diff --git a/tests/node/test_wakunode_store.nim b/tests/node/test_wakunode_store.nim index 284b32e64..9f312afd5 100644 --- a/tests/node/test_wakunode_store.nim +++ b/tests/node/test_wakunode_store.nim @@ -6,7 +6,7 @@ import waku/[ common/paging, node/waku_node, - node/api, + node/kernel_api, node/peer_manager, waku_core, waku_core/message/digest, @@ -486,7 +486,7 @@ suite "Waku Store - End to End - Sorted Archive": await otherServer.start() let otherServerRemotePeerInfo = otherServer.peerInfo.toRemotePeerInfo() - # When making a history query to the first server node + # When making a history query to the first server node let queryResponse = await client.query(storeQuery, serverRemotePeerInfo) # Then the response contains the messages diff --git a/tests/test_message_cache.nim b/tests/test_message_cache.nim index cd2e882c1..95904f8f2 100644 --- a/tests/test_message_cache.nim +++ b/tests/test_message_cache.nim @@ -1,7 +1,7 @@ {.used.} import std/[sets, random], results, stew/byteutils, testutils/unittests -import waku/waku_core, waku/waku_api/message_cache, ./testlib/wakucore +import waku/waku_core, waku/rest_api/message_cache, ./testlib/wakucore randomize() diff --git a/tests/waku_discv5/test_waku_discv5.nim b/tests/waku_discv5/test_waku_discv5.nim index d1cd6c46f..6685bda32 100644 --- a/tests/waku_discv5/test_waku_discv5.nim +++ b/tests/waku_discv5/test_waku_discv5.nim @@ -22,7 +22,7 @@ import factory/conf_builder/conf_builder, factory/waku, node/waku_node, - node/api, + node/kernel_api, node/peer_manager, ], ../testlib/[wakucore, testasync, assertions, futures, wakunode, testutils], diff --git a/tests/waku_filter_v2/test_waku_client.nim b/tests/waku_filter_v2/test_waku_client.nim index 6ae1f2902..c57699d39 100644 --- a/tests/waku_filter_v2/test_waku_client.nim +++ b/tests/waku_filter_v2/test_waku_client.nim @@ -3,7 +3,7 @@ import std/[options, sequtils, json], testutils/unittests, results, chronos import - waku/node/[peer_manager, waku_node, api], + waku/node/[peer_manager, waku_node, kernel_api], waku/waku_core, waku/waku_filter_v2/[common, client, subscriptions, protocol, rpc_codec], ../testlib/[wakucore, testasync, testutils, futures, sequtils, wakunode], diff --git a/tests/wakunode_rest/test_rest_admin.nim b/tests/wakunode_rest/test_rest_admin.nim index e47207a42..6de886f74 100644 --- a/tests/wakunode_rest/test_rest_admin.nim +++ b/tests/wakunode_rest/test_rest_admin.nim @@ -14,12 +14,12 @@ import waku_node, waku_filter_v2/client, node/peer_manager, - waku_api/rest/server, - waku_api/rest/client, - waku_api/rest/responses, - waku_api/rest/admin/types, - waku_api/rest/admin/handlers as admin_api, - waku_api/rest/admin/client as admin_api_client, + rest_api/endpoint/server, + rest_api/endpoint/client, + rest_api/endpoint/responses, + rest_api/endpoint/admin/types, + rest_api/endpoint/admin/handlers as admin_rest_interface, + rest_api/endpoint/admin/client as admin_rest_client, waku_relay, waku_peer_exchange, ], diff --git a/tests/wakunode_rest/test_rest_cors.nim b/tests/wakunode_rest/test_rest_cors.nim index 58e70aa25..0393b0d72 100644 --- a/tests/wakunode_rest/test_rest_cors.nim +++ b/tests/wakunode_rest/test_rest_cors.nim @@ -11,8 +11,8 @@ import waku/[ waku_node, node/waku_node as waku_node2, - waku_api/rest/server, - waku_api/rest/debug/handlers as debug_api, + rest_api/endpoint/server, + rest_api/endpoint/debug/handlers as debug_rest_interface, ], ../testlib/common, ../testlib/wakucore, diff --git a/tests/wakunode_rest/test_rest_debug.nim b/tests/wakunode_rest/test_rest_debug.nim index 9add57cbe..4bd2e8c02 100644 --- a/tests/wakunode_rest/test_rest_debug.nim +++ b/tests/wakunode_rest/test_rest_debug.nim @@ -12,11 +12,11 @@ import waku_node, node/waku_node as waku_node2, # TODO: Remove after moving `git_version` to the app code. - waku_api/rest/server, - waku_api/rest/client, - waku_api/rest/responses, - waku_api/rest/debug/handlers as debug_api, - waku_api/rest/debug/client as debug_api_client, + rest_api/endpoint/server, + rest_api/endpoint/client, + rest_api/endpoint/responses, + rest_api/endpoint/debug/handlers as debug_rest_interface, + rest_api/endpoint/debug/client as debug_rest_client, ], ../testlib/common, ../testlib/wakucore, diff --git a/tests/wakunode_rest/test_rest_debug_serdes.nim b/tests/wakunode_rest/test_rest_debug_serdes.nim index 13b791dc9..d3232e571 100644 --- a/tests/wakunode_rest/test_rest_debug_serdes.nim +++ b/tests/wakunode_rest/test_rest_debug_serdes.nim @@ -1,7 +1,7 @@ {.used.} import results, stew/byteutils, testutils/unittests, json_serialization -import waku/waku_api/rest/serdes, waku/waku_api/rest/debug/types +import waku/rest_api/endpoint/serdes, waku/rest_api/endpoint/debug/types suite "Waku v2 REST API - Debug - serialization": suite "DebugWakuInfo - decode": diff --git a/tests/wakunode_rest/test_rest_filter.nim b/tests/wakunode_rest/test_rest_filter.nim index f8dbf429a..3d4d741a5 100644 --- a/tests/wakunode_rest/test_rest_filter.nim +++ b/tests/wakunode_rest/test_rest_filter.nim @@ -9,21 +9,21 @@ import libp2p/crypto/crypto import waku/[ - waku_api/message_cache, + rest_api/message_cache, waku_core, waku_node, node/peer_manager, - waku_api/rest/server, - waku_api/rest/client, - waku_api/rest/responses, - waku_api/rest/filter/types, - waku_api/rest/filter/handlers as filter_api, - waku_api/rest/filter/client as filter_api_client, + rest_api/endpoint/server, + rest_api/endpoint/client, + rest_api/endpoint/responses, + rest_api/endpoint/filter/types, + rest_api/endpoint/filter/handlers as filter_rest_interface, + rest_api/endpoint/filter/client as filter_rest_client, waku_relay, waku_filter_v2/subscriptions, waku_filter_v2/common, - waku_api/rest/relay/handlers as relay_api, - waku_api/rest/relay/client as relay_api_client, + rest_api/endpoint/relay/handlers as relay_rest_interface, + rest_api/endpoint/relay/client as relay_rest_client, ], ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/wakunode_rest/test_rest_health.nim b/tests/wakunode_rest/test_rest_health.nim index ec70b0874..dacfd801e 100644 --- a/tests/wakunode_rest/test_rest_health.nim +++ b/tests/wakunode_rest/test_rest_health.nim @@ -13,11 +13,11 @@ import waku_node, node/waku_node as waku_node2, # TODO: Remove after moving `git_version` to the app code. - waku_api/rest/server, - waku_api/rest/client, - waku_api/rest/responses, - waku_api/rest/health/handlers as health_api, - waku_api/rest/health/client as health_api_client, + rest_api/endpoint/server, + rest_api/endpoint/client, + rest_api/endpoint/responses, + rest_api/endpoint/health/handlers as health_rest_interface, + rest_api/endpoint/health/client as health_rest_client, waku_rln_relay, node/health_monitor, ], diff --git a/tests/wakunode_rest/test_rest_lightpush.nim b/tests/wakunode_rest/test_rest_lightpush.nim index b09c72ee3..cc5c715b8 100644 --- a/tests/wakunode_rest/test_rest_lightpush.nim +++ b/tests/wakunode_rest/test_rest_lightpush.nim @@ -10,17 +10,17 @@ import import waku/[ - waku_api/message_cache, + rest_api/message_cache, waku_core, waku_node, node/peer_manager, waku_lightpush/common, - waku_api/rest/server, - waku_api/rest/client, - waku_api/rest/responses, - waku_api/rest/lightpush/types, - waku_api/rest/lightpush/handlers as lightpush_api, - waku_api/rest/lightpush/client as lightpush_api_client, + rest_api/endpoint/server, + rest_api/endpoint/client, + rest_api/endpoint/responses, + rest_api/endpoint/lightpush/types, + rest_api/endpoint/lightpush/handlers as lightpush_rest_interface, + rest_api/endpoint/lightpush/client as lightpush_rest_client, waku_relay, common/rate_limit/setting, ], diff --git a/tests/wakunode_rest/test_rest_lightpush_legacy.nim b/tests/wakunode_rest/test_rest_lightpush_legacy.nim index fea51554b..526a6c24e 100644 --- a/tests/wakunode_rest/test_rest_lightpush_legacy.nim +++ b/tests/wakunode_rest/test_rest_lightpush_legacy.nim @@ -10,17 +10,17 @@ import import waku/[ - waku_api/message_cache, + rest_api/message_cache, waku_core, waku_node, node/peer_manager, waku_lightpush_legacy/common, - waku_api/rest/server, - waku_api/rest/client, - waku_api/rest/responses, - waku_api/rest/legacy_lightpush/types, - waku_api/rest/legacy_lightpush/handlers as lightpush_api, - waku_api/rest/legacy_lightpush/client as lightpush_api_client, + rest_api/endpoint/server, + rest_api/endpoint/client, + rest_api/endpoint/responses, + rest_api/endpoint/legacy_lightpush/types, + rest_api/endpoint/legacy_lightpush/handlers as lightpush_rest_interface, + rest_api/endpoint/legacy_lightpush/client as lightpush_rest_client, waku_relay, common/rate_limit/setting, ], diff --git a/tests/wakunode_rest/test_rest_relay.nim b/tests/wakunode_rest/test_rest_relay.nim index 99470dbc8..ca9f7cb17 100644 --- a/tests/wakunode_rest/test_rest_relay.nim +++ b/tests/wakunode_rest/test_rest_relay.nim @@ -12,13 +12,13 @@ import common/base64, waku_core, waku_node, - waku_api/message_cache, - waku_api/rest/server, - waku_api/rest/client, - waku_api/rest/responses, - waku_api/rest/relay/types, - waku_api/rest/relay/handlers as relay_api, - waku_api/rest/relay/client as relay_api_client, + rest_api/message_cache, + rest_api/endpoint/server, + rest_api/endpoint/client, + rest_api/endpoint/responses, + rest_api/endpoint/relay/types, + rest_api/endpoint/relay/handlers as relay_rest_interface, + rest_api/endpoint/relay/client as relay_rest_client, waku_relay, waku_rln_relay, ], @@ -263,7 +263,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials() @@ -514,7 +514,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials() @@ -586,7 +586,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials() @@ -648,7 +648,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials() @@ -723,7 +723,7 @@ suite "Waku v2 Rest API - Relay": await node.mountRlnRelay(wakuRlnConfig) await node.start() - # Registration is mandatory before sending messages with rln-relay + # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.wakuRlnRelay.groupManager) let idCredentials = generateCredentials() diff --git a/tests/wakunode_rest/test_rest_relay_serdes.nim b/tests/wakunode_rest/test_rest_relay_serdes.nim index 086aba22b..21d21e281 100644 --- a/tests/wakunode_rest/test_rest_relay_serdes.nim +++ b/tests/wakunode_rest/test_rest_relay_serdes.nim @@ -1,7 +1,9 @@ {.used.} import results, stew/byteutils, unittest2, json_serialization -import waku/[common/base64, waku_api/rest/serdes, waku_api/rest/relay/types, waku_core] +import + waku/ + [common/base64, rest_api/endpoint/serdes, rest_api/endpoint/relay/types, waku_core] suite "Waku v2 Rest API - Relay - serialization": suite "RelayWakuMessage - decode": diff --git a/tests/wakunode_rest/test_rest_serdes.nim b/tests/wakunode_rest/test_rest_serdes.nim index 719742bf8..2237e9216 100644 --- a/tests/wakunode_rest/test_rest_serdes.nim +++ b/tests/wakunode_rest/test_rest_serdes.nim @@ -1,9 +1,9 @@ {.used.} import results, stew/byteutils, chronicles, unittest2, json_serialization -import waku/waku_api/rest/serdes, waku/waku_api/rest/debug/types +import waku/rest_api/endpoint/serdes, waku/rest_api/endpoint/debug/types -# TODO: Decouple this test suite from the `debug_api` module by defining +# TODO: Decouple this test suite from the `debug_rest_interface` module by defining # private custom types for this test suite module suite "Waku v2 Rest API - Serdes": suite "decode": diff --git a/tests/wakunode_rest/test_rest_store.nim b/tests/wakunode_rest/test_rest_store.nim index b86513f0d..70a3c137a 100644 --- a/tests/wakunode_rest/test_rest_store.nim +++ b/tests/wakunode_rest/test_rest_store.nim @@ -17,12 +17,12 @@ import waku_core/time, waku_node, node/peer_manager, - waku_api/rest/server, - waku_api/rest/client, - waku_api/rest/responses, - waku_api/rest/store/handlers as store_api, - waku_api/rest/store/client as store_api_client, - waku_api/rest/store/types, + rest_api/endpoint/server, + rest_api/endpoint/client, + rest_api/endpoint/responses, + rest_api/endpoint/store/handlers as store_rest_interface, + rest_api/endpoint/store/client as store_rest_client, + rest_api/endpoint/store/types, waku_archive, waku_archive/driver/queue_driver, waku_archive/driver/sqlite_driver, @@ -34,7 +34,7 @@ import ../testlib/wakunode logScope: - topics = "waku node rest store_api test" + topics = "waku node rest store_rest_interface test" proc put( store: ArchiveDriver, pubsubTopic: PubsubTopic, message: WakuMessage diff --git a/tools/confutils/cli_args.nim b/tools/confutils/cli_args.nim index fb8437299..e6b3fc97d 100644 --- a/tools/confutils/cli_args.nim +++ b/tools/confutils/cli_args.nim @@ -34,7 +34,9 @@ import import ./envvar as confEnvvarDefs, ./envvar_net as confEnvvarNet -export confTomlDefs, confTomlNet, confEnvvarDefs, confEnvvarNet, ProtectedShard +export + confTomlDefs, confTomlNet, confEnvvarDefs, confEnvvarNet, ProtectedShard, + DefaultMaxWakuMessageSizeStr logScope: topics = "waku cli args" diff --git a/waku/api.nim b/waku/api.nim new file mode 100644 index 000000000..c3211867d --- /dev/null +++ b/waku/api.nim @@ -0,0 +1,3 @@ +import ./api/[api, api_conf, entry_nodes] + +export api, api_conf, entry_nodes diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim index 0adebd44e..bed8a9137 100644 --- a/waku/factory/waku.nim +++ b/waku/factory/waku.nim @@ -28,9 +28,9 @@ import ../node/health_monitor, ../node/waku_metrics, ../node/delivery_monitor/delivery_monitor, - ../waku_api/message_cache, - ../waku_api/rest/server, - ../waku_api/rest/builder as rest_server_builder, + ../rest_api/message_cache, + ../rest_api/endpoint/server, + ../rest_api/endpoint/builder as rest_server_builder, ../waku_archive, ../waku_relay/protocol, ../discovery/waku_dnsdisc, diff --git a/waku/factory/waku_conf.nim b/waku/factory/waku_conf.nim index fe6ead490..89ffb366c 100644 --- a/waku/factory/waku_conf.nim +++ b/waku/factory/waku_conf.nim @@ -9,7 +9,7 @@ import import ../waku_rln_relay/rln_relay, - ../waku_api/rest/builder, + ../rest_api/endpoint/builder, ../discovery/waku_discv5, ../node/waku_metrics, ../common/logging, @@ -38,7 +38,7 @@ type ProtectedShard* {.requiresInit.} = object type DnsDiscoveryConf* {.requiresInit.} = object enrTreeUrl*: string - # TODO: should probably only have one set of name servers (see dnsaddrs) + # TODO: should probably only have one set of name servers (see dnsaddrs) nameServers*: seq[IpAddress] type StoreSyncConf* {.requiresInit.} = object diff --git a/waku/node/api.nim b/waku/node/api.nim deleted file mode 100644 index 6f8f1cdd9..000000000 --- a/waku/node/api.nim +++ /dev/null @@ -1,9 +0,0 @@ -import - ./api/filter as filter_api, - ./api/lightpush as lightpush_api, - ./api/store as store_api, - ./api/relay as relay_api, - ./api/peer_exchange as peer_exchange_api, - ./api/ping as ping_api - -export filter_api, lightpush_api, store_api, relay_api, peer_exchange_api, ping_api diff --git a/waku/node/health_monitor/node_health_monitor.nim b/waku/node/health_monitor/node_health_monitor.nim index a98e6577a..eb5d0ed8c 100644 --- a/waku/node/health_monitor/node_health_monitor.nim +++ b/waku/node/health_monitor/node_health_monitor.nim @@ -8,7 +8,7 @@ import import ../waku_node, - ../api, + ../kernel_api, ../../waku_rln_relay, ../../waku_relay, ../peer_manager, diff --git a/waku/node/kernel_api.nim b/waku/node/kernel_api.nim new file mode 100644 index 000000000..9d19acb07 --- /dev/null +++ b/waku/node/kernel_api.nim @@ -0,0 +1,9 @@ +import + ./kernel_api/filter as filter_api, + ./kernel_api/lightpush as lightpush_api, + ./kernel_api/store as store_api, + ./kernel_api/relay as relay_api, + ./kernel_api/peer_exchange as peer_exchange_api, + ./kernel_api/ping as ping_api + +export filter_api, lightpush_api, store_api, relay_api, peer_exchange_api, ping_api diff --git a/waku/node/api/filter.nim b/waku/node/kernel_api/filter.nim similarity index 100% rename from waku/node/api/filter.nim rename to waku/node/kernel_api/filter.nim diff --git a/waku/node/api/lightpush.nim b/waku/node/kernel_api/lightpush.nim similarity index 100% rename from waku/node/api/lightpush.nim rename to waku/node/kernel_api/lightpush.nim diff --git a/waku/node/api/peer_exchange.nim b/waku/node/kernel_api/peer_exchange.nim similarity index 100% rename from waku/node/api/peer_exchange.nim rename to waku/node/kernel_api/peer_exchange.nim diff --git a/waku/node/api/ping.nim b/waku/node/kernel_api/ping.nim similarity index 100% rename from waku/node/api/ping.nim rename to waku/node/kernel_api/ping.nim diff --git a/waku/node/api/relay.nim b/waku/node/kernel_api/relay.nim similarity index 100% rename from waku/node/api/relay.nim rename to waku/node/kernel_api/relay.nim diff --git a/waku/node/api/store.nim b/waku/node/kernel_api/store.nim similarity index 100% rename from waku/node/api/store.nim rename to waku/node/kernel_api/store.nim diff --git a/waku/waku_api/rest/admin/client.nim b/waku/rest_api/endpoint/admin/client.nim similarity index 100% rename from waku/waku_api/rest/admin/client.nim rename to waku/rest_api/endpoint/admin/client.nim diff --git a/waku/waku_api/rest/admin/handlers.nim b/waku/rest_api/endpoint/admin/handlers.nim similarity index 100% rename from waku/waku_api/rest/admin/handlers.nim rename to waku/rest_api/endpoint/admin/handlers.nim diff --git a/waku/waku_api/rest/admin/types.nim b/waku/rest_api/endpoint/admin/types.nim similarity index 100% rename from waku/waku_api/rest/admin/types.nim rename to waku/rest_api/endpoint/admin/types.nim diff --git a/waku/waku_api/rest/builder.nim b/waku/rest_api/endpoint/builder.nim similarity index 86% rename from waku/waku_api/rest/builder.nim rename to waku/rest_api/endpoint/builder.nim index eb514439f..bbd8de422 100644 --- a/waku/waku_api/rest/builder.nim +++ b/waku/rest_api/endpoint/builder.nim @@ -5,18 +5,18 @@ import presto import waku/waku_node, waku/discovery/waku_discv5, - waku/waku_api/message_cache, - waku/waku_api/handlers, - waku/waku_api/rest/server, - waku/waku_api/rest/debug/handlers as rest_debug_api, - waku/waku_api/rest/relay/handlers as rest_relay_api, - waku/waku_api/rest/filter/handlers as rest_filter_api, - waku/waku_api/rest/legacy_lightpush/handlers as rest_legacy_lightpush_api, - waku/waku_api/rest/lightpush/handlers as rest_lightpush_api, - waku/waku_api/rest/store/handlers as rest_store_api, - waku/waku_api/rest/legacy_store/handlers as rest_store_legacy_api, - waku/waku_api/rest/health/handlers as rest_health_api, - waku/waku_api/rest/admin/handlers as rest_admin_api, + waku/rest_api/message_cache, + waku/rest_api/handlers, + waku/rest_api/endpoint/server, + waku/rest_api/endpoint/debug/handlers as rest_debug_endpoint, + waku/rest_api/endpoint/relay/handlers as rest_relay_endpoint, + waku/rest_api/endpoint/filter/handlers as rest_filter_endpoint, + waku/rest_api/endpoint/legacy_lightpush/handlers as rest_legacy_lightpush_endpoint, + waku/rest_api/endpoint/lightpush/handlers as rest_lightpush_endpoint, + waku/rest_api/endpoint/store/handlers as rest_store_endpoint, + waku/rest_api/endpoint/legacy_store/handlers as rest_store_legacy_endpoint, + waku/rest_api/endpoint/health/handlers as rest_health_endpoint, + waku/rest_api/endpoint/admin/handlers as rest_admin_endpoint, waku/waku_core/topics, waku/waku_relay/protocol @@ -180,7 +180,7 @@ proc startRestServerProtocolSupport*( else: none(DiscoveryHandler) - rest_filter_api.installFilterRestApiHandlers( + rest_filter_endpoint.installFilterRestApiHandlers( router, node, filterCache, filterDiscoHandler ) else: @@ -193,8 +193,8 @@ proc startRestServerProtocolSupport*( else: none(DiscoveryHandler) - rest_store_api.installStoreApiHandlers(router, node, storeDiscoHandler) - rest_store_legacy_api.installStoreApiHandlers(router, node, storeDiscoHandler) + rest_store_endpoint.installStoreApiHandlers(router, node, storeDiscoHandler) + rest_store_legacy_endpoint.installStoreApiHandlers(router, node, storeDiscoHandler) ## Light push API ## Install it either if client is mounted) @@ -208,10 +208,12 @@ proc startRestServerProtocolSupport*( else: none(DiscoveryHandler) - rest_legacy_lightpush_api.installLightPushRequestHandler( + rest_legacy_lightpush_endpoint.installLightPushRequestHandler( + router, node, lightDiscoHandler + ) + rest_lightpush_endpoint.installLightPushRequestHandler( router, node, lightDiscoHandler ) - rest_lightpush_api.installLightPushRequestHandler(router, node, lightDiscoHandler) else: restServerNotInstalledTab["lightpush"] = "/lightpush endpoints are not available." diff --git a/waku/waku_api/rest/client.nim b/waku/rest_api/endpoint/client.nim similarity index 100% rename from waku/waku_api/rest/client.nim rename to waku/rest_api/endpoint/client.nim diff --git a/waku/waku_api/rest/debug/client.nim b/waku/rest_api/endpoint/debug/client.nim similarity index 100% rename from waku/waku_api/rest/debug/client.nim rename to waku/rest_api/endpoint/debug/client.nim diff --git a/waku/waku_api/rest/debug/handlers.nim b/waku/rest_api/endpoint/debug/handlers.nim similarity index 100% rename from waku/waku_api/rest/debug/handlers.nim rename to waku/rest_api/endpoint/debug/handlers.nim diff --git a/waku/waku_api/rest/debug/types.nim b/waku/rest_api/endpoint/debug/types.nim similarity index 100% rename from waku/waku_api/rest/debug/types.nim rename to waku/rest_api/endpoint/debug/types.nim diff --git a/waku/waku_api/rest/filter/client.nim b/waku/rest_api/endpoint/filter/client.nim similarity index 100% rename from waku/waku_api/rest/filter/client.nim rename to waku/rest_api/endpoint/filter/client.nim diff --git a/waku/waku_api/rest/filter/handlers.nim b/waku/rest_api/endpoint/filter/handlers.nim similarity index 100% rename from waku/waku_api/rest/filter/handlers.nim rename to waku/rest_api/endpoint/filter/handlers.nim diff --git a/waku/waku_api/rest/filter/types.nim b/waku/rest_api/endpoint/filter/types.nim similarity index 100% rename from waku/waku_api/rest/filter/types.nim rename to waku/rest_api/endpoint/filter/types.nim diff --git a/waku/waku_api/rest/health/client.nim b/waku/rest_api/endpoint/health/client.nim similarity index 100% rename from waku/waku_api/rest/health/client.nim rename to waku/rest_api/endpoint/health/client.nim diff --git a/waku/waku_api/rest/health/handlers.nim b/waku/rest_api/endpoint/health/handlers.nim similarity index 100% rename from waku/waku_api/rest/health/handlers.nim rename to waku/rest_api/endpoint/health/handlers.nim diff --git a/waku/waku_api/rest/health/types.nim b/waku/rest_api/endpoint/health/types.nim similarity index 100% rename from waku/waku_api/rest/health/types.nim rename to waku/rest_api/endpoint/health/types.nim diff --git a/waku/waku_api/rest/legacy_lightpush/client.nim b/waku/rest_api/endpoint/legacy_lightpush/client.nim similarity index 100% rename from waku/waku_api/rest/legacy_lightpush/client.nim rename to waku/rest_api/endpoint/legacy_lightpush/client.nim diff --git a/waku/waku_api/rest/legacy_lightpush/handlers.nim b/waku/rest_api/endpoint/legacy_lightpush/handlers.nim similarity index 100% rename from waku/waku_api/rest/legacy_lightpush/handlers.nim rename to waku/rest_api/endpoint/legacy_lightpush/handlers.nim diff --git a/waku/waku_api/rest/legacy_lightpush/types.nim b/waku/rest_api/endpoint/legacy_lightpush/types.nim similarity index 100% rename from waku/waku_api/rest/legacy_lightpush/types.nim rename to waku/rest_api/endpoint/legacy_lightpush/types.nim diff --git a/waku/waku_api/rest/legacy_store/client.nim b/waku/rest_api/endpoint/legacy_store/client.nim similarity index 100% rename from waku/waku_api/rest/legacy_store/client.nim rename to waku/rest_api/endpoint/legacy_store/client.nim diff --git a/waku/waku_api/rest/legacy_store/handlers.nim b/waku/rest_api/endpoint/legacy_store/handlers.nim similarity index 100% rename from waku/waku_api/rest/legacy_store/handlers.nim rename to waku/rest_api/endpoint/legacy_store/handlers.nim diff --git a/waku/waku_api/rest/legacy_store/types.nim b/waku/rest_api/endpoint/legacy_store/types.nim similarity index 100% rename from waku/waku_api/rest/legacy_store/types.nim rename to waku/rest_api/endpoint/legacy_store/types.nim diff --git a/waku/waku_api/rest/lightpush/client.nim b/waku/rest_api/endpoint/lightpush/client.nim similarity index 100% rename from waku/waku_api/rest/lightpush/client.nim rename to waku/rest_api/endpoint/lightpush/client.nim diff --git a/waku/waku_api/rest/lightpush/handlers.nim b/waku/rest_api/endpoint/lightpush/handlers.nim similarity index 100% rename from waku/waku_api/rest/lightpush/handlers.nim rename to waku/rest_api/endpoint/lightpush/handlers.nim diff --git a/waku/waku_api/rest/lightpush/types.nim b/waku/rest_api/endpoint/lightpush/types.nim similarity index 100% rename from waku/waku_api/rest/lightpush/types.nim rename to waku/rest_api/endpoint/lightpush/types.nim diff --git a/waku/waku_api/rest/origin_handler.nim b/waku/rest_api/endpoint/origin_handler.nim similarity index 100% rename from waku/waku_api/rest/origin_handler.nim rename to waku/rest_api/endpoint/origin_handler.nim diff --git a/waku/waku_api/rest/relay/client.nim b/waku/rest_api/endpoint/relay/client.nim similarity index 100% rename from waku/waku_api/rest/relay/client.nim rename to waku/rest_api/endpoint/relay/client.nim diff --git a/waku/waku_api/rest/relay/handlers.nim b/waku/rest_api/endpoint/relay/handlers.nim similarity index 100% rename from waku/waku_api/rest/relay/handlers.nim rename to waku/rest_api/endpoint/relay/handlers.nim diff --git a/waku/waku_api/rest/relay/types.nim b/waku/rest_api/endpoint/relay/types.nim similarity index 100% rename from waku/waku_api/rest/relay/types.nim rename to waku/rest_api/endpoint/relay/types.nim diff --git a/waku/waku_api/rest/responses.nim b/waku/rest_api/endpoint/responses.nim similarity index 100% rename from waku/waku_api/rest/responses.nim rename to waku/rest_api/endpoint/responses.nim diff --git a/waku/waku_api/rest/rest_serdes.nim b/waku/rest_api/endpoint/rest_serdes.nim similarity index 100% rename from waku/waku_api/rest/rest_serdes.nim rename to waku/rest_api/endpoint/rest_serdes.nim diff --git a/waku/waku_api/rest/serdes.nim b/waku/rest_api/endpoint/serdes.nim similarity index 100% rename from waku/waku_api/rest/serdes.nim rename to waku/rest_api/endpoint/serdes.nim diff --git a/waku/waku_api/rest/server.nim b/waku/rest_api/endpoint/server.nim similarity index 100% rename from waku/waku_api/rest/server.nim rename to waku/rest_api/endpoint/server.nim diff --git a/waku/waku_api/rest/store/client.nim b/waku/rest_api/endpoint/store/client.nim similarity index 100% rename from waku/waku_api/rest/store/client.nim rename to waku/rest_api/endpoint/store/client.nim diff --git a/waku/waku_api/rest/store/handlers.nim b/waku/rest_api/endpoint/store/handlers.nim similarity index 100% rename from waku/waku_api/rest/store/handlers.nim rename to waku/rest_api/endpoint/store/handlers.nim diff --git a/waku/waku_api/rest/store/types.nim b/waku/rest_api/endpoint/store/types.nim similarity index 100% rename from waku/waku_api/rest/store/types.nim rename to waku/rest_api/endpoint/store/types.nim diff --git a/waku/waku_api/handlers.nim b/waku/rest_api/handlers.nim similarity index 100% rename from waku/waku_api/handlers.nim rename to waku/rest_api/handlers.nim diff --git a/waku/waku_api/message_cache.nim b/waku/rest_api/message_cache.nim similarity index 100% rename from waku/waku_api/message_cache.nim rename to waku/rest_api/message_cache.nim diff --git a/waku/waku_api.nim b/waku/waku_api.nim deleted file mode 100644 index b584bfa2f..000000000 --- a/waku/waku_api.nim +++ /dev/null @@ -1,3 +0,0 @@ -import ./waku_api/message_cache, ./waku_api/rest, ./waku_api/json_rpc - -export message_cache, rest diff --git a/waku/waku_archive_legacy/common.nim b/waku/waku_archive_legacy/common.nim index ee45181cb..ed2b7272d 100644 --- a/waku/waku_archive_legacy/common.nim +++ b/waku/waku_archive_legacy/common.nim @@ -31,7 +31,7 @@ proc computeDigest*(msg: WakuMessage): MessageDigest = # Computes the hash return ctx.finish() -## Public API types +## API types type #TODO Once Store v2 is removed, the cursor becomes the hash of the last message diff --git a/waku/waku_node.nim b/waku/waku_node.nim index c81e49bb6..e782e616b 100644 --- a/waku/waku_node.nim +++ b/waku/waku_node.nim @@ -3,6 +3,6 @@ import ./node/waku_switch as switch, ./node/waku_node as node, ./node/health_monitor as health_monitor, - ./node/api as api + ./node/kernel_api as kernel_api -export net_config, switch, node, health_monitor, api +export net_config, switch, node, health_monitor, kernel_api diff --git a/waku/waku_rest.nim b/waku/waku_rest.nim new file mode 100644 index 000000000..8a1737335 --- /dev/null +++ b/waku/waku_rest.nim @@ -0,0 +1,3 @@ +import ./rest_api/message_cache, ./rest_api/endpoint, ./rest_api/json_rpc + +export message_cache, rest diff --git a/waku/waku_store/common.nim b/waku/waku_store/common.nim index d11c803f9..70446be4b 100644 --- a/waku/waku_store/common.nim +++ b/waku/waku_store/common.nim @@ -15,7 +15,7 @@ const type WakuStoreResult*[T] = Result[T, string] -## Public API types +## API types type StoreQueryRequest* = object diff --git a/waku/waku_store_legacy/common.nim b/waku/waku_store_legacy/common.nim index c1958f201..6da7f267e 100644 --- a/waku/waku_store_legacy/common.nim +++ b/waku/waku_store_legacy/common.nim @@ -29,7 +29,7 @@ proc computeDigest*(msg: WakuMessage): MessageDigest = # Computes the hash return ctx.finish() -## Public API types +## API types type HistoryCursor* = object