Skip to content

Commit

Permalink
chore: flatten waku v2 protocols folder
Browse files Browse the repository at this point in the history
  • Loading branch information
Lorenzo Delgado committed Apr 18, 2023
1 parent b62193e commit d7b72ac
Show file tree
Hide file tree
Showing 184 changed files with 320 additions and 323 deletions.
14 changes: 7 additions & 7 deletions apps/chat2/chat2.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import libp2p/[switch, # manage transports, a single entry poi
protocols/secure/secio, # define the protocol of secure input / output, allows encrypted communication that uses public keys to validate signed messages instead of a certificate authority like in TLS
nameresolving/dnsresolver]# define DNS resolution
import
../../waku/v2/protocol/waku_message,
../../waku/v2/protocol/waku_lightpush,
../../waku/v2/protocol/waku_lightpush/rpc,
../../waku/v2/protocol/waku_filter,
../../waku/v2/protocol/waku_store,
../../waku/v2/protocol/waku_dnsdisc,
../../waku/v2/waku_message,
../../waku/v2/waku_lightpush,
../../waku/v2/waku_lightpush/rpc,
../../waku/v2/waku_filter,
../../waku/v2/waku_store,
../../waku/v2/waku_dnsdisc,
../../waku/v2/waku_node,
../../waku/v2/node/waku_metrics,
../../waku/v2/node/peer_manager,
Expand All @@ -43,7 +43,7 @@ when defined(rln):
libp2p/protocols/pubsub/rpc/messages,
libp2p/protocols/pubsub/pubsub
import
../../waku/v2/protocol/waku_rln_relay
../../waku/v2/waku_rln_relay

const Help = """
Commands: /[?|help|connect|nick|exit]
Expand Down
2 changes: 1 addition & 1 deletion apps/chat2/config_chat2.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import
nimcrypto/utils,
eth/keys
import
../../../waku/v2/protocol/waku_message
../../../waku/v2/waku_message

type
Fleet* = enum
Expand Down
6 changes: 3 additions & 3 deletions apps/chat2bridge/chat2bridge.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import
# Waku v2 imports
libp2p/crypto/crypto,
libp2p/errors,
../../../waku/v2/protocol/waku_message,
../../../waku/v2/waku_message,
../../../waku/v2/waku_node,
../../../waku/v2/utils/peers,
../../../waku/v2/node/peer_manager,
../../waku/v2/protocol/waku_filter,
../../waku/v2/protocol/waku_store,
../../waku/v2/waku_filter,
../../waku/v2/waku_store,
# Chat 2 imports
../chat2/chat2,
# Common cli config
Expand Down
2 changes: 1 addition & 1 deletion apps/wakubridge/message_compat.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import
libp2p/crypto/crypto
import
../../waku/v1/protocol/waku_protocol,
../../waku/v2/protocol/waku_message
../../waku/v2/waku_message


const
Expand Down
6 changes: 3 additions & 3 deletions apps/wakubridge/wakubridge.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import
libp2p/crypto/crypto,
libp2p/nameresolving/nameresolver,
../../waku/v2/utils/time,
../../waku/v2/protocol/waku_message,
../../waku/v2/protocol/waku_store,
../../waku/v2/protocol/waku_filter,
../../waku/v2/waku_message,
../../waku/v2/waku_store,
../../waku/v2/waku_filter,
../../waku/v2/node/message_cache,
../../waku/v2/waku_node,
../../waku/v2/node/peer_manager,
Expand Down
34 changes: 17 additions & 17 deletions apps/wakunode2/wakunode2.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,30 @@ import
../../waku/v2/node/peer_manager/peer_store/migrations as peer_store_sqlite_migrations,
../../waku/v2/waku_node,
../../waku/v2/node/waku_metrics,
../../waku/v2/protocol/waku_archive,
../../waku/v2/protocol/waku_archive/driver/queue_driver,
../../waku/v2/protocol/waku_archive/driver/sqlite_driver,
../../waku/v2/protocol/waku_archive/driver/sqlite_driver/migrations as archive_driver_sqlite_migrations,
../../waku/v2/protocol/waku_archive/retention_policy,
../../waku/v2/protocol/waku_archive/retention_policy/retention_policy_capacity,
../../waku/v2/protocol/waku_archive/retention_policy/retention_policy_time,
../../waku/v2/protocol/waku_store,
../../waku/v2/protocol/waku_filter,
../../waku/v2/protocol/waku_lightpush,
../../waku/v2/protocol/waku_enr,
../../waku/v2/protocol/waku_dnsdisc,
../../waku/v2/protocol/waku_discv5,
../../waku/v2/protocol/waku_message/topics/pubsub_topic,
../../waku/v2/protocol/waku_peer_exchange,
../../waku/v2/protocol/waku_relay/validators,
../../waku/v2/waku_archive,
../../waku/v2/waku_archive/driver/queue_driver,
../../waku/v2/waku_archive/driver/sqlite_driver,
../../waku/v2/waku_archive/driver/sqlite_driver/migrations as archive_driver_sqlite_migrations,
../../waku/v2/waku_archive/retention_policy,
../../waku/v2/waku_archive/retention_policy/retention_policy_capacity,
../../waku/v2/waku_archive/retention_policy/retention_policy_time,
../../waku/v2/waku_store,
../../waku/v2/waku_filter,
../../waku/v2/waku_lightpush,
../../waku/v2/waku_enr,
../../waku/v2/waku_dnsdisc,
../../waku/v2/waku_discv5,
../../waku/v2/waku_message/topics/pubsub_topic,
../../waku/v2/waku_peer_exchange,
../../waku/v2/waku_relay/validators,
../../waku/v2/utils/peers,
./wakunode2_setup_rest,
./wakunode2_setup_rpc,
./config

when defined(rln):
import
../../waku/v2/protocol/waku_rln_relay
../../waku/v2/waku_rln_relay


logScope:
Expand Down
6 changes: 3 additions & 3 deletions examples/v2/publisher.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import
../../../waku/common/logging,
../../../waku/v2/node/peer_manager,
../../../waku/v2/waku_node,
../../../waku/v2/protocol/waku_message,
../../../waku/v2/protocol/waku_enr,
../../../waku/v2/protocol/waku_discv5,
../../../waku/v2/waku_message,
../../../waku/v2/waku_enr,
../../../waku/v2/waku_discv5,
../../../waku/v2/utils/time

proc now*(): Timestamp =
Expand Down
6 changes: 3 additions & 3 deletions examples/v2/subscriber.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import
../../../waku/common/logging,
../../../waku/v2/node/peer_manager,
../../../waku/v2/waku_node,
../../../waku/v2/protocol/waku_message,
../../../waku/v2/protocol/waku_enr,
../../../waku/v2/protocol/waku_discv5
../../../waku/v2/waku_message,
../../../waku/v2/waku_enr,
../../../waku/v2/waku_discv5

# An accesible bootstrap node. See wakuv2.prod fleets.status.im
const bootstrapNode = "enr:-Nm4QOdTOKZJKTUUZ4O_W932CXIET-M9NamewDnL78P5u9DOGnZl" &
Expand Down
2 changes: 1 addition & 1 deletion tests/v2/test_message_cache.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import
testutils/unittests,
chronicles
import
../../waku/v2/protocol/waku_message,
../../waku/v2/waku_message,
../../waku/v2/node/message_cache,
./testlib/common,
./testlib/wakucore
Expand Down
10 changes: 5 additions & 5 deletions tests/v2/test_peer_manager.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import
../../waku/v2/node/peer_manager/peer_manager,
../../waku/v2/node/peer_manager/peer_store/waku_peer_storage,
../../waku/v2/waku_node,
../../waku/v2/protocol/waku_relay,
../../waku/v2/protocol/waku_store,
../../waku/v2/protocol/waku_filter,
../../waku/v2/protocol/waku_lightpush,
../../waku/v2/protocol/waku_peer_exchange,
../../waku/v2/waku_relay,
../../waku/v2/waku_store,
../../waku/v2/waku_filter,
../../waku/v2/waku_lightpush,
../../waku/v2/waku_peer_exchange,
./testlib/common,
./testlib/testutils,
./testlib/wakucore,
Expand Down
2 changes: 1 addition & 1 deletion tests/v2/test_utils_compat.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import
testutils/unittests
import
../../waku/v2/protocol/waku_message,
../../waku/v2/waku_message,
../../waku/v2/utils/compat,
../../waku/v2/utils/time,
./testlib/common
Expand Down
4 changes: 2 additions & 2 deletions tests/v2/test_waku_discv5.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import
eth/p2p/discoveryv5/enr
import
../../waku/v2/waku_node,
../../waku/v2/protocol/waku_message,
../../waku/v2/protocol/waku_discv5,
../../waku/v2/waku_message,
../../waku/v2/waku_discv5,
./testlib/common,
./testlib/wakucore,
./testlib/wakunode
Expand Down
2 changes: 1 addition & 1 deletion tests/v2/test_waku_dnsdisc.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import
import
../../waku/v2/node/peer_manager,
../../waku/v2/waku_node,
../../waku/v2/protocol/waku_dnsdisc,
../../waku/v2/waku_dnsdisc,
./testlib/common,
./testlib/wakucore,
./testlib/wakunode
Expand Down
4 changes: 2 additions & 2 deletions tests/v2/test_waku_enr.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import
stew/results,
testutils/unittests
import
../../waku/v2/protocol/waku_message,
../../waku/v2/protocol/waku_enr,
../../waku/v2/waku_message,
../../waku/v2/waku_enr,
./testlib/wakucore


Expand Down
6 changes: 3 additions & 3 deletions tests/v2/test_waku_filter.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import
libp2p/crypto/crypto
import
../../waku/v2/node/peer_manager,
../../waku/v2/protocol/waku_message,
../../waku/v2/protocol/waku_filter,
../../waku/v2/protocol/waku_filter/client,
../../waku/v2/waku_message,
../../waku/v2/waku_filter,
../../waku/v2/waku_filter/client,
./testlib/common,
./testlib/wakucore

Expand Down
4 changes: 2 additions & 2 deletions tests/v2/test_waku_keystore.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import
std/[algorithm, json, options, os],
testutils/unittests, chronos, stint
import
../../waku/v2/protocol/waku_keystore,
../../waku/v2/waku_keystore,
./testlib/common

from ../../waku/v2/protocol/waku_noise/noise_utils import randomSeqByte
from ../../waku/v2/waku_noise/noise_utils import randomSeqByte

procSuite "Credentials test suite":

Expand Down
4 changes: 2 additions & 2 deletions tests/v2/test_waku_keystore_keyfile.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import
testutils/unittests, chronos,
eth/keys
import
../../waku/v2/protocol/waku_keystore,
../../waku/v2/waku_keystore,
./testlib/common

from ../../waku/v2/protocol/waku_noise/noise_utils import randomSeqByte
from ../../waku/v2/waku_noise/noise_utils import randomSeqByte

suite "KeyFile test suite":

Expand Down
6 changes: 3 additions & 3 deletions tests/v2/test_waku_lightpush.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import
libp2p/crypto/crypto
import
../../waku/v2/node/peer_manager,
../../waku/v2/protocol/waku_message,
../../waku/v2/protocol/waku_lightpush,
../../waku/v2/protocol/waku_lightpush/client,
../../waku/v2/waku_message,
../../waku/v2/waku_lightpush,
../../waku/v2/waku_lightpush/client,
./testlib/common,
./testlib/wakucore

Expand Down
6 changes: 3 additions & 3 deletions tests/v2/test_waku_message_digest.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import
stew/byteutils,
testutils/unittests
import
../../waku/v2/protocol/waku_message,
../../waku/v2/protocol/waku_message/codec,
../../waku/v2/protocol/waku_message/digest,
../../waku/v2/waku_message,
../../waku/v2/waku_message/codec,
../../waku/v2/waku_message/digest,
./testlib/wakucore

suite "Waku Message - Deterministic hashing":
Expand Down
2 changes: 1 addition & 1 deletion tests/v2/test_waku_message_topics.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import
stew/results,
testutils/unittests
import
../../waku/v2/protocol/waku_message/topics
../../waku/v2/waku_message/topics

suite "Waku Message - Content topics namespacing":

Expand Down
10 changes: 5 additions & 5 deletions tests/v2/test_waku_noise.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import
stew/endians2
import
../../waku/v2/utils/noise as waku_message_utils,
../../waku/v2/protocol/waku_noise/noise_types,
../../waku/v2/protocol/waku_noise/noise_utils,
../../waku/v2/protocol/waku_noise/noise,
../../waku/v2/protocol/waku_noise/noise_handshake_processing,
../../waku/v2/protocol/waku_message,
../../waku/v2/waku_noise/noise_types,
../../waku/v2/waku_noise/noise_utils,
../../waku/v2/waku_noise/noise,
../../waku/v2/waku_noise/noise_handshake_processing,
../../waku/v2/waku_message,
./testlib/common


Expand Down
8 changes: 4 additions & 4 deletions tests/v2/test_waku_noise_sessions.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import
import
../../waku/common/protobuf,
../../waku/v2/utils/noise as waku_message_utils,
../../waku/v2/protocol/waku_noise/noise_types,
../../waku/v2/protocol/waku_noise/noise_utils,
../../waku/v2/protocol/waku_noise/noise_handshake_processing,
../../waku/v2/protocol/waku_message,
../../waku/v2/waku_noise/noise_types,
../../waku/v2/waku_noise/noise_utils,
../../waku/v2/waku_noise/noise_handshake_processing,
../../waku/v2/waku_message,
./testlib/common

procSuite "Waku Noise Sessions":
Expand Down
8 changes: 4 additions & 4 deletions tests/v2/test_waku_peer_exchange.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import
import
../../waku/v2/waku_node,
../../waku/v2/node/peer_manager,
../../waku/v2/protocol/waku_discv5,
../../waku/v2/protocol/waku_peer_exchange,
../../waku/v2/protocol/waku_peer_exchange/rpc,
../../waku/v2/protocol/waku_peer_exchange/rpc_codec,
../../waku/v2/waku_discv5,
../../waku/v2/waku_peer_exchange,
../../waku/v2/waku_peer_exchange/rpc,
../../waku/v2/waku_peer_exchange/rpc_codec,
./testlib/wakucore,
./testlib/wakunode

Expand Down
6 changes: 3 additions & 3 deletions tests/v2/test_wakunode.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import
import
../../waku/v2/waku_node,
../../waku/v2/node/peer_manager,
../../waku/v2/protocol/waku_message,
../../waku/v2/protocol/waku_relay,
../../waku/v2/protocol/waku_peer_exchange,
../../waku/v2/waku_message,
../../waku/v2/waku_relay,
../../waku/v2/waku_peer_exchange,
../../waku/v2/utils/peers,
./testlib/wakucore,
./testlib/wakunode
Expand Down
2 changes: 1 addition & 1 deletion tests/v2/test_wakunode_filter.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import
import
../../waku/v2/node/peer_manager,
../../waku/v2/waku_node,
../../waku/v2/protocol/waku_message,
../../waku/v2/waku_message,
../../waku/v2/utils/peers,
./testlib/common,
./testlib/wakucore,
Expand Down
4 changes: 2 additions & 2 deletions tests/v2/test_wakunode_lightpush.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import
libp2p/crypto/crypto,
libp2p/switch
import
../../waku/v2/protocol/waku_message,
../../waku/v2/protocol/waku_lightpush,
../../waku/v2/waku_message,
../../waku/v2/waku_lightpush,
../../waku/v2/node/peer_manager,
../../waku/v2/utils/peers,
../../waku/v2/waku_node,
Expand Down
2 changes: 1 addition & 1 deletion tests/v2/testlib/wakucore.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import
libp2p/crypto/crypto as libp2p_keys,
eth/keys as eth_keys
import
../../../waku/v2/protocol/waku_message,
../../../waku/v2/waku_message,
./common

export switch
Expand Down
4 changes: 2 additions & 2 deletions tests/v2/testlib/wakunode.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import
import
../../../waku/v2/waku_node,
../../../waku/v2/node/peer_manager,
../../../waku/v2/protocol/waku_enr,
../../../waku/v2/protocol/waku_discv5,
../../../waku/v2/waku_enr,
../../../waku/v2/waku_discv5,
./common


Expand Down

0 comments on commit d7b72ac

Please sign in to comment.