Skip to content

Commit 1762548

Browse files
chore: clarify api folders (#3637)
* Rename waku_api to rest_api and underlying rest to endpoint for clearity * Rename node/api to node/kernel_api to suggest that it is an internal accessor to node interface + make everything compile after renaming * make waku api a top level import * fix use of relative path imports and use default to root rather in case of waku and tools modules
1 parent 262d33e commit 1762548

File tree

92 files changed

+162
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+162
-147
lines changed

apps/chat2bridge/chat2bridge.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ proc stop*(cmb: Chat2MatterBridge) {.async: (raises: [Exception]).} =
240240
{.pop.}
241241
# @TODO confutils.nim(775, 17) Error: can raise an unlisted exception: ref IOError
242242
when isMainModule:
243-
import waku/common/utils/nat, waku/waku_api/message_cache
243+
import waku/common/utils/nat, waku/rest_api/message_cache
244244

245245
let
246246
rng = newRng()

apps/liteprotocoltester/diagnose_connections.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import
1414
libp2p/wire
1515

1616
import
17-
../../tools/confutils/cli_args,
17+
tools/confutils/cli_args,
1818
waku/[
1919
node/peer_manager,
2020
waku_lightpush/common,

apps/liteprotocoltester/liteprotocoltester.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import
1111
confutils
1212

1313
import
14-
../../tools/confutils/cli_args,
14+
tools/confutils/cli_args,
1515
waku/[
1616
common/enr,
1717
common/logging,

apps/liteprotocoltester/receiver.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ proc maintainSubscription(
7777
some(filterPubsubTopic), filterContentTopic, actualFilterPeer
7878
)
7979
).errorOr:
80-
await sleepAsync(subscriptionMaintenanceMs)
80+
await sleepAsync(SubscriptionMaintenanceMs)
8181
if noFailedSubscribes > 0:
8282
noFailedSubscribes -= 1
8383
notice "subscribe request successful."

apps/liteprotocoltester/service_peer_management.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import
1111
libp2p/wire
1212

1313
import
14-
../wakunode2/cli_args,
14+
tools/confutils/cli_args,
1515
waku/[
1616
common/enr,
1717
waku_node,

apps/liteprotocoltester/statistics.nim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import
88
results,
99
libp2p/peerid
1010

11+
from std/sugar import `=>`
12+
1113
import ./tester_message, ./lpt_metrics
1214

1315
type

apps/liteprotocoltester/tester_message.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import
66
json_serialization/std/options,
77
json_serialization/lexer
88

9-
import ../../waku/waku_api/rest/serdes
9+
import waku/rest_api/endpoint/serdes
1010

1111
type ProtocolTesterMessage* = object
1212
sender*: string

apps/wakunode2/wakunode2.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import
1414
common/logging,
1515
factory/waku,
1616
node/health_monitor,
17-
waku_api/rest/builder as rest_server_builder,
17+
rest_api/endpoint/builder as rest_server_builder,
1818
waku_core/message/default_values,
1919
]
2020

examples/wakustealthcommitments/node_spec.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{.push raises: [].}
22

3-
import ../../apps/wakunode2/cli_args
3+
import tools/confutils/cli_args
44
import waku/[common/logging, factory/[waku, networks_config]]
55
import
66
std/[options, strutils, os, sequtils],

library/waku_thread_requests/requests/discovery_request.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import
66
../../../waku/discovery/waku_discv5,
77
../../../waku/waku_core/peers,
88
../../../waku/node/waku_node,
9-
../../../waku/node/api,
9+
../../../waku/node/kernel_api,
1010
../../alloc
1111

1212
type DiscoveryMsgType* = enum

0 commit comments

Comments
 (0)