From 091cb5d899aa4ddca6bc040ac3af1960101f40ff Mon Sep 17 00:00:00 2001 From: Simon-Pierre Vivier Date: Fri, 22 Sep 2023 09:36:46 -0400 Subject: [PATCH] refactor: Moved external APIs out of node (#2069) --- apps/chat2bridge/chat2bridge.nim | 10 +++--- apps/wakunode2/app.nim | 34 +++++++++---------- tests/test_message_cache.nim | 2 +- tests/wakunode_jsonrpc/test_jsonrpc_admin.nim | 4 +-- tests/wakunode_jsonrpc/test_jsonrpc_debug.nim | 4 +-- .../wakunode_jsonrpc/test_jsonrpc_filter.nim | 6 ++-- tests/wakunode_jsonrpc/test_jsonrpc_relay.nim | 6 ++-- tests/wakunode_jsonrpc/test_jsonrpc_store.nim | 4 +-- tests/wakunode_rest/test_rest_debug.nim | 10 +++--- .../wakunode_rest/test_rest_debug_serdes.nim | 4 +-- tests/wakunode_rest/test_rest_filter.nim | 20 +++++------ tests/wakunode_rest/test_rest_health.nim | 10 +++--- .../wakunode_rest/test_rest_legacy_filter.nim | 14 ++++---- tests/wakunode_rest/test_rest_lightpush.nim | 14 ++++---- tests/wakunode_rest/test_rest_relay.nim | 14 ++++---- .../wakunode_rest/test_rest_relay_serdes.nim | 4 +-- tests/wakunode_rest/test_rest_serdes.nim | 4 +-- tests/wakunode_rest/test_rest_store.nim | 12 +++---- waku/node/waku_node.nim | 5 +-- waku/waku_api.nim | 9 +++++ .../jsonrpc/admin/callsigs.nim | 0 .../jsonrpc/admin/client.nim | 0 .../jsonrpc/admin/handlers.nim | 4 +-- .../jsonrpc/admin/types.nim | 0 .../jsonrpc/debug/callsigs.nim | 0 .../jsonrpc/debug/client.nim | 2 +- .../jsonrpc/debug/handlers.nim | 2 +- .../jsonrpc/filter/callsigs.nim | 0 .../jsonrpc/filter/client.nim | 0 .../jsonrpc/filter/handlers.nim | 7 ++-- .../{node => waku_api}/jsonrpc/hexstrings.nim | 0 .../jsonrpc/marshalling.nim | 0 waku/{node => waku_api}/jsonrpc/message.nim | 0 .../jsonrpc/relay/callsigs.nim | 0 .../jsonrpc/relay/client.nim | 0 .../jsonrpc/relay/handlers.nim | 2 +- .../jsonrpc/store/callsigs.nim | 0 .../jsonrpc/store/client.nim | 0 .../jsonrpc/store/handlers.nim | 4 +-- .../jsonrpc/store/types.nim | 0 waku/{node => waku_api}/message_cache.nim | 0 waku/{node => waku_api}/rest/client.nim | 0 waku/{node => waku_api}/rest/debug/client.nim | 0 .../rest/debug/handlers.nim | 2 +- .../rest/debug/openapi.yaml | 0 waku/{node => waku_api}/rest/debug/types.nim | 2 +- .../{node => waku_api}/rest/filter/client.nim | 0 .../rest/filter/handlers.nim | 4 +-- .../rest/filter/legacy_client.nim | 0 .../rest/filter/legacy_handlers.nim | 4 +-- .../rest/filter/openapi.yaml | 0 waku/{node => waku_api}/rest/filter/types.nim | 0 .../{node => waku_api}/rest/health/client.nim | 0 .../rest/health/handlers.nim | 2 +- .../rest/health/openapi.yaml | 0 .../rest/lightpush/client.nim | 0 .../rest/lightpush/handlers.nim | 4 +-- .../rest/lightpush/openapi.yaml | 0 .../rest/lightpush/types.nim | 0 waku/{node => waku_api}/rest/relay/client.nim | 0 .../rest/relay/handlers.nim | 2 +- .../rest/relay/openapi.yaml | 0 .../rest/relay/topic_cache.nim | 0 waku/{node => waku_api}/rest/relay/types.nim | 0 waku/{node => waku_api}/rest/responses.nim | 0 waku/{node => waku_api}/rest/serdes.nim | 0 waku/{node => waku_api}/rest/server.nim | 0 waku/{node => waku_api}/rest/store/client.nim | 0 .../rest/store/handlers.nim | 5 ++- .../rest/store/openapi.yaml | 0 waku/{node => waku_api}/rest/store/types.nim | 0 71 files changed, 121 insertions(+), 115 deletions(-) create mode 100644 waku/waku_api.nim rename waku/{node => waku_api}/jsonrpc/admin/callsigs.nim (100%) rename waku/{node => waku_api}/jsonrpc/admin/client.nim (100%) rename waku/{node => waku_api}/jsonrpc/admin/handlers.nim (98%) rename waku/{node => waku_api}/jsonrpc/admin/types.nim (100%) rename waku/{node => waku_api}/jsonrpc/debug/callsigs.nim (100%) rename waku/{node => waku_api}/jsonrpc/debug/client.nim (92%) rename waku/{node => waku_api}/jsonrpc/debug/handlers.nim (96%) rename waku/{node => waku_api}/jsonrpc/filter/callsigs.nim (100%) rename waku/{node => waku_api}/jsonrpc/filter/client.nim (100%) rename waku/{node => waku_api}/jsonrpc/filter/handlers.nim (97%) rename waku/{node => waku_api}/jsonrpc/hexstrings.nim (100%) rename waku/{node => waku_api}/jsonrpc/marshalling.nim (100%) rename waku/{node => waku_api}/jsonrpc/message.nim (100%) rename waku/{node => waku_api}/jsonrpc/relay/callsigs.nim (100%) rename waku/{node => waku_api}/jsonrpc/relay/client.nim (100%) rename waku/{node => waku_api}/jsonrpc/relay/handlers.nim (99%) rename waku/{node => waku_api}/jsonrpc/store/callsigs.nim (100%) rename waku/{node => waku_api}/jsonrpc/store/client.nim (100%) rename waku/{node => waku_api}/jsonrpc/store/handlers.nim (98%) rename waku/{node => waku_api}/jsonrpc/store/types.nim (100%) rename waku/{node => waku_api}/message_cache.nim (100%) rename waku/{node => waku_api}/rest/client.nim (100%) rename waku/{node => waku_api}/rest/debug/client.nim (100%) rename waku/{node => waku_api}/rest/debug/handlers.nim (98%) rename waku/{node => waku_api}/rest/debug/openapi.yaml (100%) rename waku/{node => waku_api}/rest/debug/types.nim (98%) rename waku/{node => waku_api}/rest/filter/client.nim (100%) rename waku/{node => waku_api}/rest/filter/handlers.nim (99%) rename waku/{node => waku_api}/rest/filter/legacy_client.nim (100%) rename waku/{node => waku_api}/rest/filter/legacy_handlers.nim (99%) rename waku/{node => waku_api}/rest/filter/openapi.yaml (100%) rename waku/{node => waku_api}/rest/filter/types.nim (100%) rename waku/{node => waku_api}/rest/health/client.nim (100%) rename waku/{node => waku_api}/rest/health/handlers.nim (98%) rename waku/{node => waku_api}/rest/health/openapi.yaml (100%) rename waku/{node => waku_api}/rest/lightpush/client.nim (100%) rename waku/{node => waku_api}/rest/lightpush/handlers.nim (97%) rename waku/{node => waku_api}/rest/lightpush/openapi.yaml (100%) rename waku/{node => waku_api}/rest/lightpush/types.nim (100%) rename waku/{node => waku_api}/rest/relay/client.nim (100%) rename waku/{node => waku_api}/rest/relay/handlers.nim (99%) rename waku/{node => waku_api}/rest/relay/openapi.yaml (100%) rename waku/{node => waku_api}/rest/relay/topic_cache.nim (100%) rename waku/{node => waku_api}/rest/relay/types.nim (100%) rename waku/{node => waku_api}/rest/responses.nim (100%) rename waku/{node => waku_api}/rest/serdes.nim (100%) rename waku/{node => waku_api}/rest/server.nim (100%) rename waku/{node => waku_api}/rest/store/client.nim (100%) rename waku/{node => waku_api}/rest/store/handlers.nim (99%) rename waku/{node => waku_api}/rest/store/openapi.yaml (100%) rename waku/{node => waku_api}/rest/store/types.nim (100%) diff --git a/apps/chat2bridge/chat2bridge.nim b/apps/chat2bridge/chat2bridge.nim index b67ee2be3..700ef5a43 100644 --- a/apps/chat2bridge/chat2bridge.nim +++ b/apps/chat2bridge/chat2bridge.nim @@ -217,11 +217,11 @@ proc stop*(cmb: Chat2MatterBridge) {.async.} = when isMainModule: import ../../../waku/common/utils/nat, - ../../waku/node/message_cache, - ../../waku/node/jsonrpc/debug/handlers as debug_api, - ../../waku/node/jsonrpc/filter/handlers as filter_api, - ../../waku/node/jsonrpc/relay/handlers as relay_api, - ../../waku/node/jsonrpc/store/handlers as store_api + ../../waku/waku_api/message_cache, + ../../waku/waku_api/jsonrpc/debug/handlers as debug_api, + ../../waku/waku_api/jsonrpc/filter/handlers as filter_api, + ../../waku/waku_api/jsonrpc/relay/handlers as relay_api, + ../../waku/waku_api/jsonrpc/store/handlers as store_api proc startV2Rpc(node: WakuNode, rpcServer: RpcHttpServer, conf: Chat2MatterbridgeConf) {.raises: [Exception].} = diff --git a/apps/wakunode2/app.nim b/apps/wakunode2/app.nim index 46a9f329c..3105991bd 100644 --- a/apps/wakunode2/app.nim +++ b/apps/wakunode2/app.nim @@ -38,26 +38,25 @@ import ../../waku/waku_lightpush, ../../waku/waku_filter, ../../waku/waku_filter_v2, - ../../waku/waku_filter_v2/client as waku_filter_client, ./wakunode2_validator_signed, ./internal_config, ./external_config import - ../../waku/node/message_cache, - ../../waku/node/rest/server, - ../../waku/node/rest/debug/handlers as rest_debug_api, - ../../waku/node/rest/relay/handlers as rest_relay_api, - ../../waku/node/rest/relay/topic_cache, - ../../waku/node/rest/filter/legacy_handlers as rest_legacy_filter_api, - ../../waku/node/rest/filter/handlers as rest_filter_api, - ../../waku/node/rest/store/handlers as rest_store_api, - ../../waku/node/rest/health/handlers as rest_health_api, - ../../waku/node/rest/lightpush/handlers as rest_lightpush_api, - ../../waku/node/jsonrpc/admin/handlers as rpc_admin_api, - ../../waku/node/jsonrpc/debug/handlers as rpc_debug_api, - ../../waku/node/jsonrpc/filter/handlers as rpc_filter_api, - ../../waku/node/jsonrpc/relay/handlers as rpc_relay_api, - ../../waku/node/jsonrpc/store/handlers as rpc_store_api + ../../waku/waku_api/message_cache, + ../../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/relay/topic_cache, + ../../waku/waku_api/rest/filter/legacy_handlers as rest_legacy_filter_api, + ../../waku/waku_api/rest/filter/handlers as rest_filter_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/health/handlers as rest_health_api, + ../../waku/waku_api/jsonrpc/admin/handlers as rpc_admin_api, + ../../waku/waku_api/jsonrpc/debug/handlers as rpc_debug_api, + ../../waku/waku_api/jsonrpc/filter/handlers as rpc_filter_api, + ../../waku/waku_api/jsonrpc/relay/handlers as rpc_relay_api, + ../../waku/waku_api/jsonrpc/store/handlers as rpc_store_api logScope: topics = "wakunode app" @@ -591,7 +590,8 @@ proc startRestServer(app: App, address: ValidIpAddress, port: Port, conf: WakuNo ## Store REST API installStoreApiHandlers(server.router, app.node) - installLightPushRequestHandler(server.router, app.node) + ## Light push API + rest_lightpush_api.installLightPushRequestHandler(server.router, app.node) server.start() info "Starting REST HTTP server", url = "http://" & $address & ":" & $port & "/" diff --git a/tests/test_message_cache.nim b/tests/test_message_cache.nim index 31fe7cdc3..b9dc69183 100644 --- a/tests/test_message_cache.nim +++ b/tests/test_message_cache.nim @@ -6,7 +6,7 @@ import chronicles import ../../waku/waku_core, - ../../waku/node/message_cache, + ../../waku/waku_api/message_cache, ./testlib/common, ./testlib/wakucore diff --git a/tests/wakunode_jsonrpc/test_jsonrpc_admin.nim b/tests/wakunode_jsonrpc/test_jsonrpc_admin.nim index e4e8c09e6..1dd84abd3 100644 --- a/tests/wakunode_jsonrpc/test_jsonrpc_admin.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_admin.nim @@ -13,8 +13,8 @@ import ../../../waku/waku_core, ../../../waku/node/peer_manager, ../../../waku/waku_node, - ../../../waku/node/jsonrpc/admin/handlers as admin_api, - ../../../waku/node/jsonrpc/admin/client as admin_api_client, + ../../../waku/waku_api/jsonrpc/admin/handlers as admin_api, + ../../../waku/waku_api/jsonrpc/admin/client as admin_api_client, ../../../waku/waku_relay, ../../../waku/waku_archive, ../../../waku/waku_archive/driver/queue_driver, diff --git a/tests/wakunode_jsonrpc/test_jsonrpc_debug.nim b/tests/wakunode_jsonrpc/test_jsonrpc_debug.nim index 5eb438df8..ae6297c9a 100644 --- a/tests/wakunode_jsonrpc/test_jsonrpc_debug.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_debug.nim @@ -11,8 +11,8 @@ import import ../../../waku/node/peer_manager, ../../../waku/waku_node, - ../../../waku/node/jsonrpc/debug/handlers as debug_api, - ../../../waku/node/jsonrpc/debug/client as debug_api_client, + ../../../waku/waku_api/jsonrpc/debug/handlers as debug_api, + ../../../waku/waku_api/jsonrpc/debug/client as debug_api_client, ../testlib/common, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/wakunode_jsonrpc/test_jsonrpc_filter.nim b/tests/wakunode_jsonrpc/test_jsonrpc_filter.nim index 8b2e43c9a..0c95626b0 100644 --- a/tests/wakunode_jsonrpc/test_jsonrpc_filter.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_filter.nim @@ -11,9 +11,9 @@ import ../../../waku/waku_core, ../../../waku/node/peer_manager, ../../../waku/waku_node, - ../../../waku/node/message_cache, - ../../../waku/node/jsonrpc/filter/handlers as filter_api, - ../../../waku/node/jsonrpc/filter/client as filter_api_client, + ../../../waku/waku_api/message_cache, + ../../../waku/waku_api/jsonrpc/filter/handlers as filter_api, + ../../../waku/waku_api/jsonrpc/filter/client as filter_api_client, ../../../waku/waku_filter, ../../../waku/waku_filter/rpc, ../../../waku/waku_filter/client, diff --git a/tests/wakunode_jsonrpc/test_jsonrpc_relay.nim b/tests/wakunode_jsonrpc/test_jsonrpc_relay.nim index 016b71613..f54d7399c 100644 --- a/tests/wakunode_jsonrpc/test_jsonrpc_relay.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_relay.nim @@ -11,10 +11,10 @@ import ../../../waku/common/base64, ../../../waku/waku_core, ../../../waku/node/peer_manager, - ../../../waku/node/message_cache, + ../../../waku/waku_api/message_cache, ../../../waku/waku_node, - ../../../waku/node/jsonrpc/relay/handlers as relay_api, - ../../../waku/node/jsonrpc/relay/client as relay_api_client, + ../../../waku/waku_api/jsonrpc/relay/handlers as relay_api, + ../../../waku/waku_api/jsonrpc/relay/client as relay_api_client, ../../../waku/waku_core, ../../../waku/waku_relay, ../../../waku/waku_rln_relay, diff --git a/tests/wakunode_jsonrpc/test_jsonrpc_store.nim b/tests/wakunode_jsonrpc/test_jsonrpc_store.nim index f2216bc84..de04f83f0 100644 --- a/tests/wakunode_jsonrpc/test_jsonrpc_store.nim +++ b/tests/wakunode_jsonrpc/test_jsonrpc_store.nim @@ -11,8 +11,8 @@ import ../../../waku/waku_core, ../../../waku/node/peer_manager, ../../../waku/waku_node, - ../../../waku/node/jsonrpc/store/handlers as store_api, - ../../../waku/node/jsonrpc/store/client as store_api_client, + ../../../waku/waku_api/jsonrpc/store/handlers as store_api, + ../../../waku/waku_api/jsonrpc/store/client as store_api_client, ../../../waku/waku_archive, ../../../waku/waku_archive/driver/queue_driver, ../../../waku/waku_store, diff --git a/tests/wakunode_rest/test_rest_debug.nim b/tests/wakunode_rest/test_rest_debug.nim index cc03cf891..b1b57cc85 100644 --- a/tests/wakunode_rest/test_rest_debug.nim +++ b/tests/wakunode_rest/test_rest_debug.nim @@ -11,11 +11,11 @@ import import ../../waku/waku_node, ../../waku/node/waku_node as waku_node2, # TODO: Remove after moving `git_version` to the app code. - ../../waku/node/rest/server, - ../../waku/node/rest/client, - ../../waku/node/rest/responses, - ../../waku/node/rest/debug/handlers as debug_api, - ../../waku/node/rest/debug/client as debug_api_client, + ../../waku/waku_api/rest/server, + ../../waku/waku_api/rest/client, + ../../waku/waku_api/rest/responses, + ../../waku/waku_api/rest/debug/handlers as debug_api, + ../../waku/waku_api/rest/debug/client as debug_api_client, ../testlib/common, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/wakunode_rest/test_rest_debug_serdes.nim b/tests/wakunode_rest/test_rest_debug_serdes.nim index 28b931569..fb0e57292 100644 --- a/tests/wakunode_rest/test_rest_debug_serdes.nim +++ b/tests/wakunode_rest/test_rest_debug_serdes.nim @@ -6,8 +6,8 @@ import testutils/unittests, json_serialization import - ../../waku/node/rest/serdes, - ../../waku/node/rest/debug/types + ../../waku/waku_api/rest/serdes, + ../../waku/waku_api/rest/debug/types suite "Waku v2 REST API - Debug - serialization": diff --git a/tests/wakunode_rest/test_rest_filter.nim b/tests/wakunode_rest/test_rest_filter.nim index c13cd08b0..a2b4ea1d3 100644 --- a/tests/wakunode_rest/test_rest_filter.nim +++ b/tests/wakunode_rest/test_rest_filter.nim @@ -8,24 +8,24 @@ import presto, presto/client as presto_client, libp2p/crypto/crypto import - ../../waku/node/message_cache, + ../../waku/waku_api/message_cache, ../../waku/common/base64, ../../waku/waku_core, ../../waku/waku_node, ../../waku/node/peer_manager, ../../waku/waku_filter, - ../../waku/node/rest/server, - ../../waku/node/rest/client, - ../../waku/node/rest/responses, - ../../waku/node/rest/filter/types, - ../../waku/node/rest/filter/handlers as filter_api, - ../../waku/node/rest/filter/client as filter_api_client, + ../../waku/waku_api/rest/server, + ../../waku/waku_api/rest/client, + ../../waku/waku_api/rest/responses, + ../../waku/waku_api/rest/filter/types, + ../../waku/waku_api/rest/filter/handlers as filter_api, + ../../waku/waku_api/rest/filter/client as filter_api_client, ../../waku/waku_relay, ../../waku/waku_filter_v2/subscriptions, ../../waku/waku_filter_v2/common, - ../../waku/node/rest/relay/topic_cache, - ../../waku/node/rest/relay/handlers as relay_api, - ../../waku/node/rest/relay/client as relay_api_client, + ../../waku/waku_api/rest/relay/topic_cache, + ../../waku/waku_api/rest/relay/handlers as relay_api, + ../../waku/waku_api/rest/relay/client as relay_api_client, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/wakunode_rest/test_rest_health.nim b/tests/wakunode_rest/test_rest_health.nim index 8d13cc644..954c03065 100644 --- a/tests/wakunode_rest/test_rest_health.nim +++ b/tests/wakunode_rest/test_rest_health.nim @@ -12,11 +12,11 @@ import import ../../waku/waku_node, ../../waku/node/waku_node as waku_node2, # TODO: Remove after moving `git_version` to the app code. - ../../waku/node/rest/server, - ../../waku/node/rest/client, - ../../waku/node/rest/responses, - ../../waku/node/rest/health/handlers as health_api, - ../../waku/node/rest/health/client as health_api_client, + ../../waku/waku_api/rest/server, + ../../waku/waku_api/rest/client, + ../../waku/waku_api/rest/responses, + ../../waku/waku_api/rest/health/handlers as health_api, + ../../waku/waku_api/rest/health/client as health_api_client, ../../waku/waku_rln_relay, ../testlib/common, ../testlib/testutils, diff --git a/tests/wakunode_rest/test_rest_legacy_filter.nim b/tests/wakunode_rest/test_rest_legacy_filter.nim index 7b4ceba77..b26dbef8f 100644 --- a/tests/wakunode_rest/test_rest_legacy_filter.nim +++ b/tests/wakunode_rest/test_rest_legacy_filter.nim @@ -8,18 +8,18 @@ import presto, presto/client as presto_client, libp2p/crypto/crypto import - ../../waku/node/message_cache, + ../../waku/waku_api/message_cache, ../../waku/common/base64, ../../waku/waku_core, ../../waku/waku_node, ../../waku/node/peer_manager, ../../waku/waku_filter, - ../../waku/node/rest/server, - ../../waku/node/rest/client, - ../../waku/node/rest/responses, - ../../waku/node/rest/filter/types, - ../../waku/node/rest/filter/legacy_handlers as filter_api, - ../../waku/node/rest/filter/legacy_client as filter_api_client, + ../../waku/waku_api/rest/server, + ../../waku/waku_api/rest/client, + ../../waku/waku_api/rest/responses, + ../../waku/waku_api/rest/filter/types, + ../../waku/waku_api/rest/filter/legacy_handlers as filter_api, + ../../waku/waku_api/rest/filter/legacy_client as filter_api_client, ../../waku/waku_relay, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/wakunode_rest/test_rest_lightpush.nim b/tests/wakunode_rest/test_rest_lightpush.nim index fbd3e0f6c..a05228beb 100644 --- a/tests/wakunode_rest/test_rest_lightpush.nim +++ b/tests/wakunode_rest/test_rest_lightpush.nim @@ -9,18 +9,18 @@ import libp2p/crypto/crypto import - ../../waku/node/message_cache, + ../../waku/waku_api/message_cache, ../../waku/common/base64, ../../waku/waku_core, ../../waku/waku_node, ../../waku/node/peer_manager, ../../waku/waku_lightpush, - ../../waku/node/rest/server, - ../../waku/node/rest/client, - ../../waku/node/rest/responses, - ../../waku/node/rest/lightpush/types, - ../../waku/node/rest/lightpush/handlers as lightpush_api, - ../../waku/node/rest/lightpush/client as lightpush_api_client, + ../../waku/waku_api/rest/server, + ../../waku/waku_api/rest/client, + ../../waku/waku_api/rest/responses, + ../../waku/waku_api/rest/lightpush/types, + ../../waku/waku_api/rest/lightpush/handlers as lightpush_api, + ../../waku/waku_api/rest/lightpush/client as lightpush_api_client, ../../waku/waku_relay, ../testlib/wakucore, ../testlib/wakunode diff --git a/tests/wakunode_rest/test_rest_relay.nim b/tests/wakunode_rest/test_rest_relay.nim index 75d111e47..2d571b39d 100644 --- a/tests/wakunode_rest/test_rest_relay.nim +++ b/tests/wakunode_rest/test_rest_relay.nim @@ -11,13 +11,13 @@ import ../../waku/common/base64, ../../waku/waku_core, ../../waku/waku_node, - ../../waku/node/rest/server, - ../../waku/node/rest/client, - ../../waku/node/rest/responses, - ../../waku/node/rest/relay/types, - ../../waku/node/rest/relay/handlers as relay_api, - ../../waku/node/rest/relay/client as relay_api_client, - ../../waku/node/rest/relay/topic_cache, + ../../waku/waku_api/rest/server, + ../../waku/waku_api/rest/client, + ../../waku/waku_api/rest/responses, + ../../waku/waku_api/rest/relay/types, + ../../waku/waku_api/rest/relay/handlers as relay_api, + ../../waku/waku_api/rest/relay/client as relay_api_client, + ../../waku/waku_api/rest/relay/topic_cache, ../../waku/waku_relay, ../../../waku/waku_rln_relay, ../testlib/wakucore, diff --git a/tests/wakunode_rest/test_rest_relay_serdes.nim b/tests/wakunode_rest/test_rest_relay_serdes.nim index 19aacfd56..d1422bb09 100644 --- a/tests/wakunode_rest/test_rest_relay_serdes.nim +++ b/tests/wakunode_rest/test_rest_relay_serdes.nim @@ -7,8 +7,8 @@ import json_serialization import ../../waku/common/base64, - ../../waku/node/rest/serdes, - ../../waku/node/rest/relay/types, + ../../waku/waku_api/rest/serdes, + ../../waku/waku_api/rest/relay/types, ../../waku/waku_core diff --git a/tests/wakunode_rest/test_rest_serdes.nim b/tests/wakunode_rest/test_rest_serdes.nim index bc9c0880c..725bf9379 100644 --- a/tests/wakunode_rest/test_rest_serdes.nim +++ b/tests/wakunode_rest/test_rest_serdes.nim @@ -6,8 +6,8 @@ import unittest2, json_serialization import - ../../waku/node/rest/serdes, - ../../waku/node/rest/debug/types + ../../waku/waku_api/rest/serdes, + ../../waku/waku_api/rest/debug/types # TODO: Decouple this test suite from the `debug_api` module by defining diff --git a/tests/wakunode_rest/test_rest_store.nim b/tests/wakunode_rest/test_rest_store.nim index cae8e859e..8e61e2fd1 100644 --- a/tests/wakunode_rest/test_rest_store.nim +++ b/tests/wakunode_rest/test_rest_store.nim @@ -14,12 +14,12 @@ import ../../../waku/waku_core/time, ../../../waku/waku_node, ../../../waku/node/peer_manager, - ../../../waku/node/rest/server, - ../../../waku/node/rest/client, - ../../../waku/node/rest/responses, - ../../../waku/node/rest/store/handlers as store_api, - ../../../waku/node/rest/store/client as store_api_client, - ../../../waku/node/rest/store/types, + ../../../waku/waku_api/rest/server, + ../../../waku/waku_api/rest/client, + ../../../waku/waku_api/rest/responses, + ../../../waku/waku_api/rest/store/handlers as store_api, + ../../../waku/waku_api/rest/store/client as store_api_client, + ../../../waku/waku_api/rest/store/types, ../../../waku/waku_archive, ../../../waku/waku_archive/driver/queue_driver, ../../../waku/waku_store as waku_store, diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim index 363581e73..a3a8f764b 100644 --- a/waku/node/waku_node.nim +++ b/waku/node/waku_node.nim @@ -20,7 +20,6 @@ import libp2p/protocols/connectivity/autonat/client, libp2p/protocols/connectivity/autonat/service, libp2p/protocols/rendezvous, - libp2p/nameresolving/nameresolver, libp2p/builders, libp2p/transports/tcptransport, libp2p/transports/wstransport @@ -41,9 +40,7 @@ import ../waku_peer_exchange, ../waku_rln_relay, ./config, - ./peer_manager, - ./waku_switch, - ./rest/relay/topic_cache + ./peer_manager declarePublicCounter waku_node_messages, "number of messages received", ["type"] diff --git a/waku/waku_api.nim b/waku/waku_api.nim new file mode 100644 index 000000000..8eb8f8464 --- /dev/null +++ b/waku/waku_api.nim @@ -0,0 +1,9 @@ +import + ./waku_api/message_cache, + ./waku_api/rest, + ./waku_api/json_rpc + +export + message_cache, + rest, + jsonrpc \ No newline at end of file diff --git a/waku/node/jsonrpc/admin/callsigs.nim b/waku/waku_api/jsonrpc/admin/callsigs.nim similarity index 100% rename from waku/node/jsonrpc/admin/callsigs.nim rename to waku/waku_api/jsonrpc/admin/callsigs.nim diff --git a/waku/node/jsonrpc/admin/client.nim b/waku/waku_api/jsonrpc/admin/client.nim similarity index 100% rename from waku/node/jsonrpc/admin/client.nim rename to waku/waku_api/jsonrpc/admin/client.nim diff --git a/waku/node/jsonrpc/admin/handlers.nim b/waku/waku_api/jsonrpc/admin/handlers.nim similarity index 98% rename from waku/node/jsonrpc/admin/handlers.nim rename to waku/waku_api/jsonrpc/admin/handlers.nim index d60994a72..c89fb05de 100644 --- a/waku/node/jsonrpc/admin/handlers.nim +++ b/waku/waku_api/jsonrpc/admin/handlers.nim @@ -12,8 +12,8 @@ import ../../../waku_store, ../../../waku_filter, ../../../waku_relay, - ../../peer_manager, - ../../waku_node, + ../../../waku_node, + ../../../node/peer_manager, ./types diff --git a/waku/node/jsonrpc/admin/types.nim b/waku/waku_api/jsonrpc/admin/types.nim similarity index 100% rename from waku/node/jsonrpc/admin/types.nim rename to waku/waku_api/jsonrpc/admin/types.nim diff --git a/waku/node/jsonrpc/debug/callsigs.nim b/waku/waku_api/jsonrpc/debug/callsigs.nim similarity index 100% rename from waku/node/jsonrpc/debug/callsigs.nim rename to waku/waku_api/jsonrpc/debug/callsigs.nim diff --git a/waku/node/jsonrpc/debug/client.nim b/waku/waku_api/jsonrpc/debug/client.nim similarity index 92% rename from waku/node/jsonrpc/debug/client.nim rename to waku/waku_api/jsonrpc/debug/client.nim index ceb11c6fd..a699a4eaa 100644 --- a/waku/node/jsonrpc/debug/client.nim +++ b/waku/waku_api/jsonrpc/debug/client.nim @@ -7,7 +7,7 @@ import std/[os, strutils], json_rpc/rpcclient import - ../../waku_node + ../../../waku_node template sourceDir: string = currentSourcePath.rsplit(DirSep, 1)[0] diff --git a/waku/node/jsonrpc/debug/handlers.nim b/waku/waku_api/jsonrpc/debug/handlers.nim similarity index 96% rename from waku/node/jsonrpc/debug/handlers.nim rename to waku/waku_api/jsonrpc/debug/handlers.nim index 582083fd2..41462d791 100644 --- a/waku/node/jsonrpc/debug/handlers.nim +++ b/waku/waku_api/jsonrpc/debug/handlers.nim @@ -7,7 +7,7 @@ import chronicles, json_rpc/rpcserver import - ../../waku_node + ../../../waku_node logScope: topics = "waku node jsonrpc debug_api" diff --git a/waku/node/jsonrpc/filter/callsigs.nim b/waku/waku_api/jsonrpc/filter/callsigs.nim similarity index 100% rename from waku/node/jsonrpc/filter/callsigs.nim rename to waku/waku_api/jsonrpc/filter/callsigs.nim diff --git a/waku/node/jsonrpc/filter/client.nim b/waku/waku_api/jsonrpc/filter/client.nim similarity index 100% rename from waku/node/jsonrpc/filter/client.nim rename to waku/waku_api/jsonrpc/filter/client.nim diff --git a/waku/node/jsonrpc/filter/handlers.nim b/waku/waku_api/jsonrpc/filter/handlers.nim similarity index 97% rename from waku/node/jsonrpc/filter/handlers.nim rename to waku/waku_api/jsonrpc/filter/handlers.nim index 312dcd036..df7e459cf 100644 --- a/waku/node/jsonrpc/filter/handlers.nim +++ b/waku/waku_api/jsonrpc/filter/handlers.nim @@ -12,9 +12,10 @@ import ../../../waku_filter, ../../../waku_filter/rpc, ../../../waku_filter/client, - ../../message_cache, - ../../peer_manager, - ../../waku_node + ../../../waku_node, + ../../../node/peer_manager, + ../../message_cache + logScope: diff --git a/waku/node/jsonrpc/hexstrings.nim b/waku/waku_api/jsonrpc/hexstrings.nim similarity index 100% rename from waku/node/jsonrpc/hexstrings.nim rename to waku/waku_api/jsonrpc/hexstrings.nim diff --git a/waku/node/jsonrpc/marshalling.nim b/waku/waku_api/jsonrpc/marshalling.nim similarity index 100% rename from waku/node/jsonrpc/marshalling.nim rename to waku/waku_api/jsonrpc/marshalling.nim diff --git a/waku/node/jsonrpc/message.nim b/waku/waku_api/jsonrpc/message.nim similarity index 100% rename from waku/node/jsonrpc/message.nim rename to waku/waku_api/jsonrpc/message.nim diff --git a/waku/node/jsonrpc/relay/callsigs.nim b/waku/waku_api/jsonrpc/relay/callsigs.nim similarity index 100% rename from waku/node/jsonrpc/relay/callsigs.nim rename to waku/waku_api/jsonrpc/relay/callsigs.nim diff --git a/waku/node/jsonrpc/relay/client.nim b/waku/waku_api/jsonrpc/relay/client.nim similarity index 100% rename from waku/node/jsonrpc/relay/client.nim rename to waku/waku_api/jsonrpc/relay/client.nim diff --git a/waku/node/jsonrpc/relay/handlers.nim b/waku/waku_api/jsonrpc/relay/handlers.nim similarity index 99% rename from waku/node/jsonrpc/relay/handlers.nim rename to waku/waku_api/jsonrpc/relay/handlers.nim index 4329a990a..213b410c5 100644 --- a/waku/node/jsonrpc/relay/handlers.nim +++ b/waku/waku_api/jsonrpc/relay/handlers.nim @@ -15,7 +15,7 @@ import ../../../waku_relay, ../../../waku_rln_relay, ../../../waku_rln_relay/rln/wrappers, - ../../waku_node, + ../../../waku_node, ../../message_cache, ../message diff --git a/waku/node/jsonrpc/store/callsigs.nim b/waku/waku_api/jsonrpc/store/callsigs.nim similarity index 100% rename from waku/node/jsonrpc/store/callsigs.nim rename to waku/waku_api/jsonrpc/store/callsigs.nim diff --git a/waku/node/jsonrpc/store/client.nim b/waku/waku_api/jsonrpc/store/client.nim similarity index 100% rename from waku/node/jsonrpc/store/client.nim rename to waku/waku_api/jsonrpc/store/client.nim diff --git a/waku/node/jsonrpc/store/handlers.nim b/waku/waku_api/jsonrpc/store/handlers.nim similarity index 98% rename from waku/node/jsonrpc/store/handlers.nim rename to waku/waku_api/jsonrpc/store/handlers.nim index db52b3522..fa0897f53 100644 --- a/waku/node/jsonrpc/store/handlers.nim +++ b/waku/waku_api/jsonrpc/store/handlers.nim @@ -11,8 +11,8 @@ import ../../../waku_core, ../../../waku_store, ../../../waku_store/rpc, - ../../waku_node, - ../../peer_manager, + ../../../waku_node, + ../../../node/peer_manager, ./types diff --git a/waku/node/jsonrpc/store/types.nim b/waku/waku_api/jsonrpc/store/types.nim similarity index 100% rename from waku/node/jsonrpc/store/types.nim rename to waku/waku_api/jsonrpc/store/types.nim diff --git a/waku/node/message_cache.nim b/waku/waku_api/message_cache.nim similarity index 100% rename from waku/node/message_cache.nim rename to waku/waku_api/message_cache.nim diff --git a/waku/node/rest/client.nim b/waku/waku_api/rest/client.nim similarity index 100% rename from waku/node/rest/client.nim rename to waku/waku_api/rest/client.nim diff --git a/waku/node/rest/debug/client.nim b/waku/waku_api/rest/debug/client.nim similarity index 100% rename from waku/node/rest/debug/client.nim rename to waku/waku_api/rest/debug/client.nim diff --git a/waku/node/rest/debug/handlers.nim b/waku/waku_api/rest/debug/handlers.nim similarity index 98% rename from waku/node/rest/debug/handlers.nim rename to waku/waku_api/rest/debug/handlers.nim index 9067a02df..95ba6f353 100644 --- a/waku/node/rest/debug/handlers.nim +++ b/waku/waku_api/rest/debug/handlers.nim @@ -8,7 +8,7 @@ import json_serialization, presto/route import - ../../waku_node, + ../../../waku_node, ../responses, ../serdes, ./types diff --git a/waku/node/rest/debug/openapi.yaml b/waku/waku_api/rest/debug/openapi.yaml similarity index 100% rename from waku/node/rest/debug/openapi.yaml rename to waku/waku_api/rest/debug/openapi.yaml diff --git a/waku/node/rest/debug/types.nim b/waku/waku_api/rest/debug/types.nim similarity index 98% rename from waku/node/rest/debug/types.nim rename to waku/waku_api/rest/debug/types.nim index 56f2d872c..102cbfc15 100644 --- a/waku/node/rest/debug/types.nim +++ b/waku/waku_api/rest/debug/types.nim @@ -8,7 +8,7 @@ import json_serialization, json_serialization/std/options import - ../../waku_node, + ../../../waku_node, ../serdes #### Types diff --git a/waku/node/rest/filter/client.nim b/waku/waku_api/rest/filter/client.nim similarity index 100% rename from waku/node/rest/filter/client.nim rename to waku/waku_api/rest/filter/client.nim diff --git a/waku/node/rest/filter/handlers.nim b/waku/waku_api/rest/filter/handlers.nim similarity index 99% rename from waku/node/rest/filter/handlers.nim rename to waku/waku_api/rest/filter/handlers.nim index 1cfc5b011..32527f386 100644 --- a/waku/node/rest/filter/handlers.nim +++ b/waku/waku_api/rest/filter/handlers.nim @@ -14,13 +14,13 @@ import presto/common import ../../../waku_core, + ../../../waku_node, + ../../../node/peer_manager, ../../../waku_filter, ../../../waku_filter_v2, ../../../waku_filter_v2/client as filter_protocol_client, ../../../waku_filter_v2/common as filter_protocol_type, ../../message_cache, - ../../peer_manager, - ../../waku_node, ../serdes, ../responses, ./types diff --git a/waku/node/rest/filter/legacy_client.nim b/waku/waku_api/rest/filter/legacy_client.nim similarity index 100% rename from waku/node/rest/filter/legacy_client.nim rename to waku/waku_api/rest/filter/legacy_client.nim diff --git a/waku/node/rest/filter/legacy_handlers.nim b/waku/waku_api/rest/filter/legacy_handlers.nim similarity index 99% rename from waku/node/rest/filter/legacy_handlers.nim rename to waku/waku_api/rest/filter/legacy_handlers.nim index 92131cb0d..09de827fc 100644 --- a/waku/node/rest/filter/legacy_handlers.nim +++ b/waku/waku_api/rest/filter/legacy_handlers.nim @@ -15,9 +15,9 @@ import ../../../waku_core, ../../../waku_filter, ../../../waku_filter/client, + ../../../node/peer_manager, + ../../../waku_node, ../../message_cache, - ../../peer_manager, - ../../waku_node, ../serdes, ../responses, ./types diff --git a/waku/node/rest/filter/openapi.yaml b/waku/waku_api/rest/filter/openapi.yaml similarity index 100% rename from waku/node/rest/filter/openapi.yaml rename to waku/waku_api/rest/filter/openapi.yaml diff --git a/waku/node/rest/filter/types.nim b/waku/waku_api/rest/filter/types.nim similarity index 100% rename from waku/node/rest/filter/types.nim rename to waku/waku_api/rest/filter/types.nim diff --git a/waku/node/rest/health/client.nim b/waku/waku_api/rest/health/client.nim similarity index 100% rename from waku/node/rest/health/client.nim rename to waku/waku_api/rest/health/client.nim diff --git a/waku/node/rest/health/handlers.nim b/waku/waku_api/rest/health/handlers.nim similarity index 98% rename from waku/node/rest/health/handlers.nim rename to waku/waku_api/rest/health/handlers.nim index 9b4fffdfe..a57fa3d27 100644 --- a/waku/node/rest/health/handlers.nim +++ b/waku/waku_api/rest/health/handlers.nim @@ -8,7 +8,7 @@ import json_serialization, presto/route import - ../../waku_node, + ../../../waku_node, ../responses, ../serdes diff --git a/waku/node/rest/health/openapi.yaml b/waku/waku_api/rest/health/openapi.yaml similarity index 100% rename from waku/node/rest/health/openapi.yaml rename to waku/waku_api/rest/health/openapi.yaml diff --git a/waku/node/rest/lightpush/client.nim b/waku/waku_api/rest/lightpush/client.nim similarity index 100% rename from waku/node/rest/lightpush/client.nim rename to waku/waku_api/rest/lightpush/client.nim diff --git a/waku/node/rest/lightpush/handlers.nim b/waku/waku_api/rest/lightpush/handlers.nim similarity index 97% rename from waku/node/rest/lightpush/handlers.nim rename to waku/waku_api/rest/lightpush/handlers.nim index a13fe6fd4..7bbf22f6d 100644 --- a/waku/node/rest/lightpush/handlers.nim +++ b/waku/waku_api/rest/lightpush/handlers.nim @@ -15,8 +15,8 @@ import import ../../../waku_core, - ../../peer_manager, - ../../waku_node, + ../../waku/node/peer_manager, + ../../../waku_node, ../../waku/waku_lightpush, ../serdes, ../responses, diff --git a/waku/node/rest/lightpush/openapi.yaml b/waku/waku_api/rest/lightpush/openapi.yaml similarity index 100% rename from waku/node/rest/lightpush/openapi.yaml rename to waku/waku_api/rest/lightpush/openapi.yaml diff --git a/waku/node/rest/lightpush/types.nim b/waku/waku_api/rest/lightpush/types.nim similarity index 100% rename from waku/node/rest/lightpush/types.nim rename to waku/waku_api/rest/lightpush/types.nim diff --git a/waku/node/rest/relay/client.nim b/waku/waku_api/rest/relay/client.nim similarity index 100% rename from waku/node/rest/relay/client.nim rename to waku/waku_api/rest/relay/client.nim diff --git a/waku/node/rest/relay/handlers.nim b/waku/waku_api/rest/relay/handlers.nim similarity index 99% rename from waku/node/rest/relay/handlers.nim rename to waku/waku_api/rest/relay/handlers.nim index 68647de76..5b4d4f97f 100644 --- a/waku/node/rest/relay/handlers.nim +++ b/waku/waku_api/rest/relay/handlers.nim @@ -12,7 +12,7 @@ import presto/route, presto/common import - ../../waku_node, + ../../../waku_node, ../../../waku_relay/protocol, ../../../waku_rln_relay, ../../../waku_rln_relay/rln/wrappers, diff --git a/waku/node/rest/relay/openapi.yaml b/waku/waku_api/rest/relay/openapi.yaml similarity index 100% rename from waku/node/rest/relay/openapi.yaml rename to waku/waku_api/rest/relay/openapi.yaml diff --git a/waku/node/rest/relay/topic_cache.nim b/waku/waku_api/rest/relay/topic_cache.nim similarity index 100% rename from waku/node/rest/relay/topic_cache.nim rename to waku/waku_api/rest/relay/topic_cache.nim diff --git a/waku/node/rest/relay/types.nim b/waku/waku_api/rest/relay/types.nim similarity index 100% rename from waku/node/rest/relay/types.nim rename to waku/waku_api/rest/relay/types.nim diff --git a/waku/node/rest/responses.nim b/waku/waku_api/rest/responses.nim similarity index 100% rename from waku/node/rest/responses.nim rename to waku/waku_api/rest/responses.nim diff --git a/waku/node/rest/serdes.nim b/waku/waku_api/rest/serdes.nim similarity index 100% rename from waku/node/rest/serdes.nim rename to waku/waku_api/rest/serdes.nim diff --git a/waku/node/rest/server.nim b/waku/waku_api/rest/server.nim similarity index 100% rename from waku/node/rest/server.nim rename to waku/waku_api/rest/server.nim diff --git a/waku/node/rest/store/client.nim b/waku/waku_api/rest/store/client.nim similarity index 100% rename from waku/node/rest/store/client.nim rename to waku/waku_api/rest/store/client.nim diff --git a/waku/node/rest/store/handlers.nim b/waku/waku_api/rest/store/handlers.nim similarity index 99% rename from waku/node/rest/store/handlers.nim rename to waku/waku_api/rest/store/handlers.nim index 3a4acf3c2..58b31f4fb 100644 --- a/waku/node/rest/store/handlers.nim +++ b/waku/waku_api/rest/store/handlers.nim @@ -11,11 +11,10 @@ import json_serialization, presto/route import - ../../../common/base64, ../../../waku_core, ../../../waku_store/common, - ../../waku_node, - ../../peer_manager, + ../../../waku_node, + ../../../node/peer_manager, ../responses, ../serdes, ./types diff --git a/waku/node/rest/store/openapi.yaml b/waku/waku_api/rest/store/openapi.yaml similarity index 100% rename from waku/node/rest/store/openapi.yaml rename to waku/waku_api/rest/store/openapi.yaml diff --git a/waku/node/rest/store/types.nim b/waku/waku_api/rest/store/types.nim similarity index 100% rename from waku/node/rest/store/types.nim rename to waku/waku_api/rest/store/types.nim