From 0bf8d573a7f85e67c34d21176edfbe9aa893de11 Mon Sep 17 00:00:00 2001 From: Lorenzo Delgado Date: Mon, 6 Mar 2023 17:19:06 +0100 Subject: [PATCH] fix: clean and normalize module imports --- waku/v2/node/jsonrpc/admin/handlers.nim | 10 +++++----- waku/v2/node/jsonrpc/debug/client.nim | 2 +- waku/v2/node/jsonrpc/debug/handlers.nim | 2 +- waku/v2/node/jsonrpc/filter/client.nim | 4 ++-- waku/v2/node/jsonrpc/filter/handlers.nim | 14 +++++++------- waku/v2/node/jsonrpc/message.nim | 6 +++--- waku/v2/node/jsonrpc/relay/client.nim | 4 ++-- waku/v2/node/jsonrpc/relay/handlers.nim | 14 +++++++------- waku/v2/node/jsonrpc/store/client.nim | 4 ++-- waku/v2/node/jsonrpc/store/handlers.nim | 10 +++++----- waku/v2/node/jsonrpc/store/types.nim | 2 +- waku/v2/node/peer_manager/peer_manager.nim | 2 +- waku/v2/node/rest/debug/handlers.nim | 2 +- waku/v2/node/rest/debug/types.nim | 2 +- waku/v2/node/rest/relay/client.nim | 2 +- waku/v2/node/rest/relay/handlers.nim | 2 +- waku/v2/node/rest/relay/topic_cache.nim | 6 +++--- waku/v2/protocol/waku_swap/waku_swap.nim | 14 +++++++++----- 18 files changed, 53 insertions(+), 49 deletions(-) diff --git a/waku/v2/node/jsonrpc/admin/handlers.nim b/waku/v2/node/jsonrpc/admin/handlers.nim index 973de045b..7bd0d0ef4 100644 --- a/waku/v2/node/jsonrpc/admin/handlers.nim +++ b/waku/v2/node/jsonrpc/admin/handlers.nim @@ -9,11 +9,11 @@ import json_rpc/rpcserver, libp2p/[peerinfo, switch] import - ../../../../waku/v2/protocol/waku_store, - ../../../../waku/v2/protocol/waku_filter, - ../../../../waku/v2/protocol/waku_relay, - ../../../../waku/v2/node/peer_manager, - ../../../../waku/v2/node/waku_node, + ../../../protocol/waku_store, + ../../../protocol/waku_filter, + ../../../protocol/waku_relay, + ../../peer_manager, + ../../waku_node, ./types diff --git a/waku/v2/node/jsonrpc/debug/client.nim b/waku/v2/node/jsonrpc/debug/client.nim index a562a16b0..ceb11c6fd 100644 --- a/waku/v2/node/jsonrpc/debug/client.nim +++ b/waku/v2/node/jsonrpc/debug/client.nim @@ -7,7 +7,7 @@ import std/[os, strutils], json_rpc/rpcclient import - ../../../../waku/v2/node/waku_node + ../../waku_node template sourceDir: string = currentSourcePath.rsplit(DirSep, 1)[0] diff --git a/waku/v2/node/jsonrpc/debug/handlers.nim b/waku/v2/node/jsonrpc/debug/handlers.nim index e0d801e17..582083fd2 100644 --- a/waku/v2/node/jsonrpc/debug/handlers.nim +++ b/waku/v2/node/jsonrpc/debug/handlers.nim @@ -7,7 +7,7 @@ import chronicles, json_rpc/rpcserver import - ../../../../waku/v2/node/waku_node + ../../waku_node logScope: topics = "waku node jsonrpc debug_api" diff --git a/waku/v2/node/jsonrpc/filter/client.nim b/waku/v2/node/jsonrpc/filter/client.nim index c9c4db7ad..25f719578 100644 --- a/waku/v2/node/jsonrpc/filter/client.nim +++ b/waku/v2/node/jsonrpc/filter/client.nim @@ -7,8 +7,8 @@ import std/[os, strutils], json_rpc/rpcclient import - ../../../../waku/v2/protocol/waku_message, - ../../../../waku/v2/protocol/waku_filter/rpc + ../../../protocol/waku_message, + ../../../protocol/waku_filter/rpc template sourceDir: string = currentSourcePath.rsplit(DirSep, 1)[0] diff --git a/waku/v2/node/jsonrpc/filter/handlers.nim b/waku/v2/node/jsonrpc/filter/handlers.nim index c0847c9b9..c676105cc 100644 --- a/waku/v2/node/jsonrpc/filter/handlers.nim +++ b/waku/v2/node/jsonrpc/filter/handlers.nim @@ -8,13 +8,13 @@ import chronicles, json_rpc/rpcserver import - ../../../../waku/v2/protocol/waku_message, - ../../../../waku/v2/protocol/waku_filter, - ../../../../waku/v2/protocol/waku_filter/rpc, - ../../../../waku/v2/protocol/waku_filter/client, - ../../../../waku/v2/node/message_cache, - ../../../../waku/v2/node/peer_manager, - ../../../../waku/v2/node/waku_node + ../../../protocol/waku_message, + ../../../protocol/waku_filter, + ../../../protocol/waku_filter/rpc, + ../../../protocol/waku_filter/client, + ../../message_cache, + ../../peer_manager, + ../../waku_node logScope: diff --git a/waku/v2/node/jsonrpc/message.nim b/waku/v2/node/jsonrpc/message.nim index 9202aea8c..c3ccdafee 100644 --- a/waku/v2/node/jsonrpc/message.nim +++ b/waku/v2/node/jsonrpc/message.nim @@ -3,9 +3,9 @@ import json, json_rpc/rpcserver import - ../../../waku/common/base64, - ../../../waku/v2/protocol/waku_message, - ../../../waku/v2/utils/time + ../../../common/base64, + ../../protocol/waku_message, + ../../utils/time type diff --git a/waku/v2/node/jsonrpc/relay/client.nim b/waku/v2/node/jsonrpc/relay/client.nim index 3fb5eea30..b38c005a0 100644 --- a/waku/v2/node/jsonrpc/relay/client.nim +++ b/waku/v2/node/jsonrpc/relay/client.nim @@ -7,8 +7,8 @@ import std/[os, strutils], json_rpc/rpcclient import - ../../../../waku/v2/protocol/waku_message, - ../../../../waku/v2/utils/compat, + ../../../protocol/waku_message, + ../../../utils/compat, ./types export types diff --git a/waku/v2/node/jsonrpc/relay/handlers.nim b/waku/v2/node/jsonrpc/relay/handlers.nim index 11b843c58..32bd4520b 100644 --- a/waku/v2/node/jsonrpc/relay/handlers.nim +++ b/waku/v2/node/jsonrpc/relay/handlers.nim @@ -10,13 +10,13 @@ import eth/keys, nimcrypto/sysrand import - ../../../../waku/common/base64, - ../../../../waku/v2/protocol/waku_message, - ../../../../waku/v2/protocol/waku_relay, - ../../../../waku/v2/node/waku_node, - ../../../../waku/v2/node/message_cache, - ../../../../waku/v2/utils/compat, - ../../../../waku/v2/utils/time, + ../../../../common/base64, + ../../../protocol/waku_message, + ../../../protocol/waku_relay, + ../../../utils/compat, + ../../../utils/time, + ../../waku_node, + ../../message_cache, ./types diff --git a/waku/v2/node/jsonrpc/store/client.nim b/waku/v2/node/jsonrpc/store/client.nim index f04645923..296f5990a 100644 --- a/waku/v2/node/jsonrpc/store/client.nim +++ b/waku/v2/node/jsonrpc/store/client.nim @@ -7,8 +7,8 @@ import std/[os, strutils], json_rpc/rpcclient import - ../../../../waku/v2/protocol/waku_store/rpc, - ../../../../waku/v2/utils/time, + ../../../protocol/waku_store/rpc, + ../../../utils/time, ./types export types diff --git a/waku/v2/node/jsonrpc/store/handlers.nim b/waku/v2/node/jsonrpc/store/handlers.nim index de507d290..0a74c5f7d 100644 --- a/waku/v2/node/jsonrpc/store/handlers.nim +++ b/waku/v2/node/jsonrpc/store/handlers.nim @@ -8,11 +8,11 @@ import chronicles, json_rpc/rpcserver import - ../../../../../waku/v2/protocol/waku_store, - ../../../../../waku/v2/protocol/waku_store/rpc, - ../../../../../waku/v2/utils/time, - ../../../../waku/v2/node/waku_node, - ../../../../waku/v2/node/peer_manager, + ../../../protocol/waku_store, + ../../../protocol/waku_store/rpc, + ../../../utils/time, + ../../waku_node, + ../../peer_manager, ./types diff --git a/waku/v2/node/jsonrpc/store/types.nim b/waku/v2/node/jsonrpc/store/types.nim index 9c10c5fda..b22edd125 100644 --- a/waku/v2/node/jsonrpc/store/types.nim +++ b/waku/v2/node/jsonrpc/store/types.nim @@ -6,7 +6,7 @@ else: import std/options import - ../../../../waku/v2/protocol/waku_store/rpc, + ../../../protocol/waku_store/rpc, ../message export message diff --git a/waku/v2/node/peer_manager/peer_manager.nim b/waku/v2/node/peer_manager/peer_manager.nim index cb7834002..a9b78acfa 100644 --- a/waku/v2/node/peer_manager/peer_manager.nim +++ b/waku/v2/node/peer_manager/peer_manager.nim @@ -11,8 +11,8 @@ import metrics, libp2p/multistream import + ../../protocol/waku_relay, ../../utils/peers, - ../../waku/v2/protocol/waku_relay, ./peer_store/peer_storage, ./waku_peer_store diff --git a/waku/v2/node/rest/debug/handlers.nim b/waku/v2/node/rest/debug/handlers.nim index d7095b28d..9067a02df 100644 --- a/waku/v2/node/rest/debug/handlers.nim +++ b/waku/v2/node/rest/debug/handlers.nim @@ -8,7 +8,7 @@ import json_serialization, presto/route import - ../../../../waku/v2/node/waku_node, + ../../waku_node, ../responses, ../serdes, ./types diff --git a/waku/v2/node/rest/debug/types.nim b/waku/v2/node/rest/debug/types.nim index 709723928..56f2d872c 100644 --- a/waku/v2/node/rest/debug/types.nim +++ b/waku/v2/node/rest/debug/types.nim @@ -8,7 +8,7 @@ import json_serialization, json_serialization/std/options import - ../../../../waku/v2/node/waku_node, + ../../waku_node, ../serdes #### Types diff --git a/waku/v2/node/rest/relay/client.nim b/waku/v2/node/rest/relay/client.nim index 36c5a4da0..07efc1a6f 100644 --- a/waku/v2/node/rest/relay/client.nim +++ b/waku/v2/node/rest/relay/client.nim @@ -11,7 +11,7 @@ import json_serialization/std/options, presto/[route, client, common] import - ../../../../waku/v2/protocol/waku_message, + ../../../protocol/waku_message, ../serdes, ../responses, ./types diff --git a/waku/v2/node/rest/relay/handlers.nim b/waku/v2/node/rest/relay/handlers.nim index 94734437d..fdd01156d 100644 --- a/waku/v2/node/rest/relay/handlers.nim +++ b/waku/v2/node/rest/relay/handlers.nim @@ -12,7 +12,7 @@ import presto/route, presto/common import - ../../../../waku/v2/node/waku_node, + ../../waku_node, ../serdes, ../responses, ./types, diff --git a/waku/v2/node/rest/relay/topic_cache.nim b/waku/v2/node/rest/relay/topic_cache.nim index 3e852cf00..a56a08773 100644 --- a/waku/v2/node/rest/relay/topic_cache.nim +++ b/waku/v2/node/rest/relay/topic_cache.nim @@ -7,9 +7,9 @@ import chronos, chronicles import - ../../../../waku/v2/protocol/waku_relay, - ../../../../waku/v2/protocol/waku_message, - ../../../../waku/v2/node/message_cache + ../../../protocol/waku_relay, + ../../../protocol/waku_message, + ../../message_cache export message_cache diff --git a/waku/v2/protocol/waku_swap/waku_swap.nim b/waku/v2/protocol/waku_swap/waku_swap.nim index bf6f928bb..e433d8843 100644 --- a/waku/v2/protocol/waku_swap/waku_swap.nim +++ b/waku/v2/protocol/waku_swap/waku_swap.nim @@ -37,16 +37,20 @@ else: import std/[tables, options, json], + stew/results, + chronos, + chronicles, + metrics, bearssl/rand, - chronos, chronicles, metrics, stew/results, libp2p/crypto/crypto, libp2p/protocols/protocol, libp2p/protobuf/minprotobuf, - libp2p/stream/connection, - ../../node/peer_manager, - ./waku_swap_types, + libp2p/stream/connection +import ../../../common/protobuf, - ../../waku/v2/protocol/waku_swap/waku_swap_contracts + ../../node/peer_manager, + ./waku_swap_contracts, + ./waku_swap_types export waku_swap_types