From 17c2b5476c9c8d9993b889453be2e9d29ceaf998 Mon Sep 17 00:00:00 2001 From: LNSD Date: Wed, 14 Sep 2022 11:22:04 +0000 Subject: [PATCH] deploy: dd3b44ff974874d32a6d86486bc8fdc5dfc86012 --- examples/v2/config_chat2.nim | 6 +++--- examples/v2/matterbridge/chat2bridge.nim | 2 ++ tests/v2/test_jsonrpc_waku.nim | 1 + tests/v2/test_peer_exchange.nim | 1 + tests/v2/test_peer_manager.nim | 2 ++ tests/v2/test_rest_debug_api.nim | 2 ++ tests/v2/test_rest_relay_api.nim | 1 + tests/v2/test_waku_discv5.nim | 1 + tests/v2/test_waku_rln_relay.nim | 1 + tests/v2/test_wakunode_lightpush.nim | 1 + waku/common/wakubridge.nim | 3 +++ waku/v2/node/config.nim | 5 ++--- waku/v2/node/jsonrpc/admin_api.nim | 2 ++ waku/v2/node/jsonrpc/relay_api.nim | 1 + waku/v2/node/wakunode2.nim | 6 +----- waku/v2/node/wakunode2_setup_metrics.nim | 3 ++- waku/v2/node/wakunode2_setup_rpc.nim | 1 + waku/v2/node/wakunode2_setup_sql_migrations.nim | 8 ++++---- waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim | 2 +- 19 files changed, 32 insertions(+), 17 deletions(-) diff --git a/examples/v2/config_chat2.nim b/examples/v2/config_chat2.nim index 97532e79c..f8bdf8aa2 100644 --- a/examples/v2/config_chat2.nim +++ b/examples/v2/config_chat2.nim @@ -6,8 +6,8 @@ import libp2p/crypto/secp, nimcrypto/utils, eth/keys, - ../../waku/v2/protocol/waku_rln_relay/waku_rln_relay_types, ../../waku/v2/protocol/waku_message + type Fleet* = enum none @@ -241,8 +241,8 @@ type rlnRelayMemIndex* {. desc: "(experimental) the index of node in the rln-relay group: a value between 0-99 inclusive", - defaultValue: MembershipIndex(0) - name: "rln-relay-membership-index" }: MembershipIndex + defaultValue: 0 + name: "rln-relay-membership-index" }: uint rlnRelayContentTopic* {. desc: "the pubsub topic for which rln-relay gets enabled", diff --git a/examples/v2/matterbridge/chat2bridge.nim b/examples/v2/matterbridge/chat2bridge.nim index c4ce040cc..ca21756da 100644 --- a/examples/v2/matterbridge/chat2bridge.nim +++ b/examples/v2/matterbridge/chat2bridge.nim @@ -10,6 +10,8 @@ import ../../../waku/common/utils/matterbridge_client, # Waku v2 imports libp2p/crypto/crypto, + libp2p/errors, + ../../../waku/v2/protocol/waku_message, ../../../waku/v2/node/wakunode2, # Chat 2 imports ../chat2, diff --git a/tests/v2/test_jsonrpc_waku.nim b/tests/v2/test_jsonrpc_waku.nim index 0273ccabb..b8806c5e6 100644 --- a/tests/v2/test_jsonrpc_waku.nim +++ b/tests/v2/test_jsonrpc_waku.nim @@ -20,6 +20,7 @@ import filter_api, admin_api, private_api], + ../../waku/v2/protocol/waku_message, ../../waku/v2/protocol/waku_relay, ../../waku/v2/protocol/waku_store, ../../waku/v2/protocol/waku_swap/waku_swap, diff --git a/tests/v2/test_peer_exchange.nim b/tests/v2/test_peer_exchange.nim index 456e4d7fc..a2cecd9d3 100644 --- a/tests/v2/test_peer_exchange.nim +++ b/tests/v2/test_peer_exchange.nim @@ -6,6 +6,7 @@ import testutils/unittests, chronicles, chronos, + libp2p/peerid, libp2p/crypto/crypto, libp2p/protocols/pubsub/gossipsub import diff --git a/tests/v2/test_peer_manager.nim b/tests/v2/test_peer_manager.nim index a8cb7227d..66f5aeb3b 100644 --- a/tests/v2/test_peer_manager.nim +++ b/tests/v2/test_peer_manager.nim @@ -14,8 +14,10 @@ import libp2p/protocols/pubsub/rpc/message import ../../waku/v2/protocol/waku_message, + ../../waku/v2/protocol/waku_relay, ../../waku/v2/protocol/waku_store, ../../waku/v2/protocol/waku_filter, + ../../waku/v2/protocol/waku_swap/waku_swap, ../../waku/v2/node/peer_manager/peer_manager, ../../waku/v2/node/storage/peer/waku_peer_storage, ../../waku/v2/node/wakunode2, diff --git a/tests/v2/test_rest_debug_api.nim b/tests/v2/test_rest_debug_api.nim index de901f37d..3ebba83af 100644 --- a/tests/v2/test_rest_debug_api.nim +++ b/tests/v2/test_rest_debug_api.nim @@ -5,6 +5,8 @@ import chronicles, testutils/unittests, presto, + libp2p/peerid, + libp2p/multiaddress, libp2p/crypto/crypto import ../../waku/v2/node/wakunode2, diff --git a/tests/v2/test_rest_relay_api.nim b/tests/v2/test_rest_relay_api.nim index 510054a4b..44028a639 100644 --- a/tests/v2/test_rest_relay_api.nim +++ b/tests/v2/test_rest_relay_api.nim @@ -10,6 +10,7 @@ import libp2p/crypto/crypto, libp2p/protocols/pubsub/pubsub import + ../../waku/v2/protocol/waku_message, ../../waku/v2/node/wakunode2, ../../waku/v2/node/rest/[server, client, base64, utils], ../../waku/v2/node/rest/relay/[api_types, relay_api, topic_cache] diff --git a/tests/v2/test_waku_discv5.nim b/tests/v2/test_waku_discv5.nim index a05a41a41..83942c18e 100644 --- a/tests/v2/test_waku_discv5.nim +++ b/tests/v2/test_waku_discv5.nim @@ -10,6 +10,7 @@ import libp2p/crypto/crypto, eth/keys, eth/p2p/discoveryv5/enr, + ../../waku/v2/protocol/waku_message, ../../waku/v2/node/discv5/waku_discv5, ../../waku/v2/node/wakunode2, ../test_helpers diff --git a/tests/v2/test_waku_rln_relay.nim b/tests/v2/test_waku_rln_relay.nim index f3783fc59..1c1b618d1 100644 --- a/tests/v2/test_waku_rln_relay.nim +++ b/tests/v2/test_waku_rln_relay.nim @@ -7,6 +7,7 @@ import stew/byteutils, stew/shims/net as stewNet, libp2p/crypto/crypto, json, + ../../waku/v2/protocol/waku_message, ../../waku/v2/protocol/waku_rln_relay/[rln, waku_rln_relay_utils, waku_rln_relay_types], ../../waku/v2/node/wakunode2, diff --git a/tests/v2/test_wakunode_lightpush.nim b/tests/v2/test_wakunode_lightpush.nim index e8fb459ea..f977c70b9 100644 --- a/tests/v2/test_wakunode_lightpush.nim +++ b/tests/v2/test_wakunode_lightpush.nim @@ -8,6 +8,7 @@ import chronos, libp2p/crypto/crypto, libp2p/switch, + ../../waku/v2/protocol/waku_message, ../../waku/v2/protocol/waku_lightpush, ../../waku/v2/node/peer_manager/peer_manager, ../../waku/v2/utils/peers, diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim index 3925f6664..83b6acb8c 100644 --- a/waku/common/wakubridge.nim +++ b/waku/common/wakubridge.nim @@ -6,6 +6,8 @@ import metrics, metrics/chronos_httpserver, stew/byteutils, stew/shims/net as stewNet, json_rpc/rpcserver, + libp2p/errors, + libp2p/peerstore, # Waku v1 imports eth/[keys, p2p], eth/common/utils, eth/p2p/[enode, peer_pool], @@ -16,6 +18,7 @@ import libp2p/nameresolving/nameresolver, ../v2/utils/namespacing, ../v2/utils/time, + ../v2/protocol/waku_message, ../v2/node/wakunode2, # Common cli config ./config_bridge diff --git a/waku/v2/node/config.nim b/waku/v2/node/config.nim index 9015c2351..0c849ad99 100644 --- a/waku/v2/node/config.nim +++ b/waku/v2/node/config.nim @@ -8,7 +8,6 @@ import libp2p/crypto/secp, nimcrypto/utils, eth/keys, - ../protocol/waku_rln_relay/waku_rln_relay_types, ../protocol/waku_message export @@ -121,8 +120,8 @@ type rlnRelayMemIndex* {. desc: "(experimental) the index of node in the rln-relay group: a value between 0-99 inclusive", - defaultValue: MembershipIndex(0) - name: "rln-relay-membership-index" }: MembershipIndex + defaultValue: 0 + name: "rln-relay-membership-index" }: uint rlnRelayPubsubTopic* {. desc: "the pubsub topic for which rln-relay gets enabled", diff --git a/waku/v2/node/jsonrpc/admin_api.nim b/waku/v2/node/jsonrpc/admin_api.nim index d61a6cf32..d4c99a0c4 100644 --- a/waku/v2/node/jsonrpc/admin_api.nim +++ b/waku/v2/node/jsonrpc/admin_api.nim @@ -9,6 +9,8 @@ import ../../protocol/waku_message, ../../protocol/waku_store, ../../protocol/waku_filter, + ../../protocol/waku_relay, + ../../protocol/waku_swap/waku_swap, ../peer_manager/peer_manager, ../wakunode2, ./jsonrpc_types diff --git a/waku/v2/node/jsonrpc/relay_api.nim b/waku/v2/node/jsonrpc/relay_api.nim index b75b7021b..047e2dc83 100644 --- a/waku/v2/node/jsonrpc/relay_api.nim +++ b/waku/v2/node/jsonrpc/relay_api.nim @@ -5,6 +5,7 @@ import chronicles, json_rpc/rpcserver, libp2p/protocols/pubsub/pubsub, + ../../protocol/waku_message, ../wakunode2, ./jsonrpc_types, ./jsonrpc_utils diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim index 31bbd97f7..ca0037413 100644 --- a/waku/v2/node/wakunode2.nim +++ b/waku/v2/node/wakunode2.nim @@ -20,7 +20,7 @@ import ../protocol/waku_swap/waku_swap, ../protocol/waku_filter, ../protocol/waku_lightpush, - ../protocol/waku_rln_relay/[waku_rln_relay_types], + ../protocol/waku_rln_relay/waku_rln_relay_types, ../utils/[peers, requests, wakuenr], ./peer_manager/peer_manager, ./storage/message/waku_store_queue, @@ -31,10 +31,6 @@ import ./wakunode2_types export - builders, - waku_relay, waku_message, - waku_swap, - waku_rln_relay_types, wakunode2_types when defined(rln): diff --git a/waku/v2/node/wakunode2_setup_metrics.nim b/waku/v2/node/wakunode2_setup_metrics.nim index 3c6b604a1..a08ceca7f 100644 --- a/waku/v2/node/wakunode2_setup_metrics.nim +++ b/waku/v2/node/wakunode2_setup_metrics.nim @@ -11,7 +11,8 @@ import ./wakunode2, ../protocol/waku_filter, ../protocol/waku_store, - ../protocol/waku_lightpush + ../protocol/waku_lightpush, + ../protocol/waku_swap/waku_swap logScope: topics = "wakunode.setup.metrics" diff --git a/waku/v2/node/wakunode2_setup_rpc.nim b/waku/v2/node/wakunode2_setup_rpc.nim index 352879667..58789c1aa 100644 --- a/waku/v2/node/wakunode2_setup_rpc.nim +++ b/waku/v2/node/wakunode2_setup_rpc.nim @@ -7,6 +7,7 @@ import json_rpc/rpcserver import ./config, + ../protocol/waku_message, ./wakunode2, ./jsonrpc/[admin_api, debug_api, diff --git a/waku/v2/node/wakunode2_setup_sql_migrations.nim b/waku/v2/node/wakunode2_setup_sql_migrations.nim index d2ff655ce..c6764f6b2 100644 --- a/waku/v2/node/wakunode2_setup_sql_migrations.nim +++ b/waku/v2/node/wakunode2_setup_sql_migrations.nim @@ -1,11 +1,11 @@ {.push raises: [Defect].} import + stew/results, chronicles, ./storage/sqlite, ./storage/migration/migration_types, - ./config, - ./wakunode2 + ./config logScope: topics = "wakunode.setup.migrations" @@ -23,7 +23,7 @@ proc runMigrations*(sqliteDatabase: SqliteDatabase, conf: WakuNodeConf) = info "running migration ...", migrationPath=migrationPath let migrationResult = sqliteDatabase.migrate(migrationPath) - if migrationResult.isErr: - warn "migration failed", error=migrationResult.error + if migrationResult.isErr(): + warn "migration failed", error=migrationResult.error() else: info "migration is done" diff --git a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim index 5ce8d0540..29b71ae3b 100644 --- a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim +++ b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim @@ -1065,7 +1065,7 @@ proc mountRlnRelay*(node: WakuNode, conf: WakuNodeConf|Chat2Conf, spamHandler: O if not conf.rlnRelayDynamic: info " setting up waku-rln-relay in off-chain mode... " # set up rln relay inputs - let (groupOpt, memKeyPairOpt, memIndexOpt) = rlnRelayStaticSetUp(conf.rlnRelayMemIndex) + let (groupOpt, memKeyPairOpt, memIndexOpt) = rlnRelayStaticSetUp(MembershipIndex(conf.rlnRelayMemIndex)) if memIndexOpt.isNone: error "failed to mount WakuRLNRelay" else: