diff --git a/apps/chat2bridge/chat2bridge.nim b/apps/chat2bridge/chat2bridge.nim index c2bf9c032f..6639ce3bbb 100644 --- a/apps/chat2bridge/chat2bridge.nim +++ b/apps/chat2bridge/chat2bridge.nim @@ -249,9 +249,7 @@ proc stop*(cmb: Chat2MatterBridge) {.async: (raises: [Exception]).} = when isMainModule: import waku/common/utils/nat, waku/waku_api/message_cache - let - rng = newRng() - conf = Chat2MatterbridgeConf.load() + let conf = Chat2MatterbridgeConf.load() if conf.logLevel != LogLevel.NONE: setLogLevel(conf.logLevel) diff --git a/examples/filter_subscriber.nim b/examples/filter_subscriber.nim index af40d21c30..4bd5fd0d6b 100644 --- a/examples/filter_subscriber.nim +++ b/examples/filter_subscriber.nim @@ -51,7 +51,6 @@ proc setupAndSubscribe(rng: ref HmacDrbgContext) {.async.} = let nodeKey = crypto.PrivateKey.random(Secp256k1, rng[])[] ip = parseIpAddress("0.0.0.0") - flags = CapabilitiesBitfield.init(relay = true) let relayShards = RelayShards.init(clusterId, shardId).valueOr: error "Relay shards initialization failed", error = error diff --git a/examples/lightpush_publisher.nim b/examples/lightpush_publisher.nim index 9c7499695e..a8e101914b 100644 --- a/examples/lightpush_publisher.nim +++ b/examples/lightpush_publisher.nim @@ -43,7 +43,6 @@ proc setupAndPublish(rng: ref HmacDrbgContext) {.async.} = let nodeKey = crypto.PrivateKey.random(Secp256k1, rng[]).get() ip = parseIpAddress("0.0.0.0") - flags = CapabilitiesBitfield.init(relay = true) let relayShards = RelayShards.init(clusterId, shardId).valueOr: error "Relay shards initialization failed", error = error diff --git a/library/libwaku.nim b/library/libwaku.nim index ad3afa1340..5a1552b942 100644 --- a/library/libwaku.nim +++ b/library/libwaku.nim @@ -5,7 +5,7 @@ when defined(linux): {.passl: "-Wl,-soname,libwaku.so".} -import std/[json, atomics, strformat, options, atomics] +import std/[json, atomics, strformat, options] import chronicles, chronos, chronos/threadsync import waku/common/base64, @@ -305,7 +305,7 @@ proc waku_relay_subscribe( handleRequest( ctx, RequestType.RELAY, - RelayRequest.createShared(RelayMsgType.SUBSCRIBE, pubSubTopic, WakuRelayHandler(cb)), + RelayRequest.createShared(RelayMsgType.SUBSCRIBE, pubSubTopic, cb), callback, userData, ) @@ -347,7 +347,7 @@ proc waku_relay_unsubscribe( ctx, RequestType.RELAY, RelayRequest.createShared( - RelayMsgType.UNSUBSCRIBE, pubSubTopic, WakuRelayHandler(onReceivedMessage(ctx)) + RelayMsgType.UNSUBSCRIBE, pubSubTopic, onReceivedMessage(ctx) ), callback, userData, diff --git a/library/waku_context.nim b/library/waku_context.nim index 6716013c97..9757dda511 100644 --- a/library/waku_context.nim +++ b/library/waku_context.nim @@ -32,7 +32,6 @@ type WakuContext* = object running: Atomic[bool] # To control when the threads are running const git_version* {.strdefine.} = "n/a" -const versionString = "version / git commit hash: " & waku.git_version template callEventCallback(ctx: ptr WakuContext, eventName: string, body: untyped) = if isNil(ctx[].eventCallback): diff --git a/waku/common/rate_limit/service_metrics.nim b/waku/common/rate_limit/service_metrics.nim index bff91f622a..4453dc5bdb 100644 --- a/waku/common/rate_limit/service_metrics.nim +++ b/waku/common/rate_limit/service_metrics.nim @@ -1,7 +1,6 @@ {.push raises: [].} import std/options -import chronos/timer import metrics, setting export metrics diff --git a/waku/factory/conf_builder/waku_conf_builder.nim b/waku/factory/conf_builder/waku_conf_builder.nim index 32631e1d79..fa49b2c32d 100644 --- a/waku/factory/conf_builder/waku_conf_builder.nim +++ b/waku/factory/conf_builder/waku_conf_builder.nim @@ -538,7 +538,7 @@ proc build*( let dns4DomainName = if builder.dns4DomainName.isSome(): let d = builder.dns4DomainName.get() - if d.string != "": + if d != "": some(d) else: none(string) diff --git a/waku/factory/internal_config.nim b/waku/factory/internal_config.nim index 60b319e0dd..64ec893546 100644 --- a/waku/factory/internal_config.nim +++ b/waku/factory/internal_config.nim @@ -69,7 +69,7 @@ proc networkConfiguration*( ## `udpPort` is only supplied to satisfy underlying APIs but is not ## actually a supported transport for libp2p traffic. let natRes = setupNat( - conf.natStrategy.string, + conf.natStrategy, clientId, Port(uint16(conf.p2pTcpPort) + portsShift), Port(uint16(conf.p2pTcpPort) + portsShift), diff --git a/waku/factory/waku_conf.nim b/waku/factory/waku_conf.nim index 4a05049063..90ccd00e68 100644 --- a/waku/factory/waku_conf.nim +++ b/waku/factory/waku_conf.nim @@ -174,7 +174,7 @@ proc validateNodeKey(wakuConf: WakuConf): Result[void, string] = proc validateNoEmptyStrings(wakuConf: WakuConf): Result[void, string] = if wakuConf.endpointConf.dns4DomainName.isSome() and - isEmptyOrWhiteSpace(wakuConf.endpointConf.dns4DomainName.get().string): + isEmptyOrWhiteSpace(wakuConf.endpointConf.dns4DomainName.get()): return err("dns4-domain-name is an empty string, set it to none(string) instead") if isEmptyOrWhiteSpace(wakuConf.relayServiceRatio): diff --git a/waku/node/peer_manager/peer_manager.nim b/waku/node/peer_manager/peer_manager.nim index 81f4206cfc..0cedb89ec9 100644 --- a/waku/node/peer_manager/peer_manager.nim +++ b/waku/node/peer_manager/peer_manager.nim @@ -545,7 +545,6 @@ proc connectToRelayPeers*(pm: PeerManager) {.async.} = return var (inRelayPeers, outRelayPeers) = pm.connectedPeers(WakuRelayCodec) - let totalRelayPeers = inRelayPeers.len + outRelayPeers.len if inRelayPeers.len > pm.inRelayPeersTarget: await pm.pruneInRelayConns(inRelayPeers.len - pm.inRelayPeersTarget) diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim index 5cb97972c9..3f9c137705 100644 --- a/waku/node/waku_node.nim +++ b/waku/node/waku_node.nim @@ -321,20 +321,20 @@ proc subscribe*( error "Invalid API call to `subscribe`. WakuRelay not mounted." return err("Invalid API call to `subscribe`. WakuRelay not mounted.") - let (pubsubTopic, contentTopicOp) = + let pubsubTopic = case subscription.kind of ContentSub: if node.wakuAutoSharding.isSome(): let shard = node.wakuAutoSharding.get().getShard((subscription.topic)).valueOr: error "Autosharding error", error = error return err("Autosharding error: " & error) - ($shard, some(subscription.topic)) + $shard else: return err( "Static sharding is used, relay subscriptions must specify a pubsub topic" ) of PubsubSub: - (subscription.topic, none(ContentTopic)) + subscription.topic else: return err("Unsupported subscription type in relay subscribe") @@ -1347,7 +1347,7 @@ proc mountLibp2pPing*(node: WakuNode) {.async: (raises: []).} = try: node.libp2pPing = Ping.new(rng = node.rng) - except Exception as e: + except Exception as _: error "failed to create ping", error = getCurrentExceptionMsg() if node.started: diff --git a/waku/waku_api/rest/relay/handlers.nim b/waku/waku_api/rest/relay/handlers.nim index c268870d70..21a5a5617f 100644 --- a/waku/waku_api/rest/relay/handlers.nim +++ b/waku/waku_api/rest/relay/handlers.nim @@ -21,8 +21,7 @@ import ../rest_serdes, ./types -from std/times import getTime -from std/times import toUnix +from std/times import getTime, toUnix export types diff --git a/waku/waku_archive/driver/sqlite_driver/migrations.nim b/waku/waku_archive/driver/sqlite_driver/migrations.nim index 16ef9467b1..c98cd826a0 100644 --- a/waku/waku_archive/driver/sqlite_driver/migrations.nim +++ b/waku/waku_archive/driver/sqlite_driver/migrations.nim @@ -31,7 +31,7 @@ proc isSchemaVersion7*(db: SqliteDatabase): DatabaseResult[bool] = var pkColumns = newSeq[string]() proc queryRowCallback(s: ptr sqlite3_stmt) = - let colName = cstring sqlite3_column_text(s, 0) + let colName = sqlite3_column_text(s, 0) pkColumns.add($colName) let query = diff --git a/waku/waku_archive_legacy/driver/sqlite_driver/migrations.nim b/waku/waku_archive_legacy/driver/sqlite_driver/migrations.nim index 4c25ddf3c8..7b5341f703 100644 --- a/waku/waku_archive_legacy/driver/sqlite_driver/migrations.nim +++ b/waku/waku_archive_legacy/driver/sqlite_driver/migrations.nim @@ -31,7 +31,7 @@ proc isSchemaVersion7*(db: SqliteDatabase): DatabaseResult[bool] = var pkColumns = newSeq[string]() proc queryRowCallback(s: ptr sqlite3_stmt) = - let colName = cstring sqlite3_column_text(s, 0) + let colName = sqlite3_column_text(s, 0) pkColumns.add($colName) let query = diff --git a/waku/waku_filter_v2/subscriptions.nim b/waku/waku_filter_v2/subscriptions.nim index 8d3b8084f0..b4b755e340 100644 --- a/waku/waku_filter_v2/subscriptions.nim +++ b/waku/waku_filter_v2/subscriptions.nim @@ -122,7 +122,6 @@ proc cleanUp*(fs: FilterSubscriptions) = let now = Moment.now() fs.peersSubscribed.keepItIf(now - val.lastSeen <= fs.subscriptionTimeout) - var filtersToRemove: seq[FilterCriterion] = @[] for filterCriterion, subscribedPeers in fs.subscriptions.mpairs: subscribedPeers.keepItIf(fs.isSubscribed(it) == true) diff --git a/waku/waku_peer_exchange/protocol.nim b/waku/waku_peer_exchange/protocol.nim index 14de77c67e..bc810d202b 100644 --- a/waku/waku_peer_exchange/protocol.nim +++ b/waku/waku_peer_exchange/protocol.nim @@ -45,8 +45,6 @@ const dialFailure = "dial_failure" peerNotFoundFailure = "peer_not_found_failure" decodeRpcFailure = "decode_rpc_failure" - retrievePeersDiscv5Error = "retrieve_peers_discv5_failure" - pxFailure = "px_failure" type WakuPeerExchangeResult*[T] = Result[T, PeerExchangeResponseStatus] diff --git a/waku/waku_relay/protocol.nim b/waku/waku_relay/protocol.nim index 070d6992f0..3843e5ae4e 100644 --- a/waku/waku_relay/protocol.nim +++ b/waku/waku_relay/protocol.nim @@ -276,7 +276,7 @@ proc initRelayObservers(w: WakuRelay) = proc onRecv(peer: PubSubPeer, msgs: var RPCMsg) = for msg in msgs.messages: - let (msg_id_short, topic, wakuMessage, msgSize) = decodeRpcMessageInfo(peer, msg).valueOr: + let (_, topic, wakuMessage, msgSize) = decodeRpcMessageInfo(peer, msg).valueOr: continue # message receive log happens in onValidated observer as onRecv is called before checks updateMetrics(peer, topic, wakuMessage, msgSize, onRecv = true) diff --git a/waku/waku_rln_relay/group_manager/group_manager_base.nim b/waku/waku_rln_relay/group_manager/group_manager_base.nim index 4a1c84e55a..101e4f2541 100644 --- a/waku/waku_rln_relay/group_manager/group_manager_base.nim +++ b/waku/waku_rln_relay/group_manager/group_manager_base.nim @@ -179,7 +179,6 @@ method generateProof*( messageId: MessageId, rlnIdentifier = DefaultRlnIdentifier, ): GroupManagerResult[RateLimitProof] {.base, gcsafe, raises: [].} = - var lastProcessedEpoch {.global.}: Epoch ## generates a proof for the given data and epoch ## the proof is generated using the current merkle root if g.idCredentials.isNone(): diff --git a/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim b/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim index 3117392371..4bdf994366 100644 --- a/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim +++ b/waku/waku_rln_relay/group_manager/on_chain/group_manager.nim @@ -555,8 +555,7 @@ method init*(g: OnchainGroupManager): Future[GroupManagerResult[void]] {.async.} let parsedPk = keys.PrivateKey.fromHex(pk).valueOr: return err("failed to parse the private key" & ": " & $error) ethRpc.privateKey = Opt.some(parsedPk) - ethRpc.defaultAccount = - ethRpc.privateKey.get().toPublicKey().toCanonicalAddress().Address + ethRpc.defaultAccount = ethRpc.privateKey.get().toPublicKey().toCanonicalAddress() let contractAddress = web3.fromHex(web3.Address, g.ethContractAddress) let wakuRlnContract = ethRpc.contractSender(WakuRlnContract, contractAddress) diff --git a/waku/waku_rln_relay/rln_relay.nim b/waku/waku_rln_relay/rln_relay.nim index 965c8c021d..d6e3514a47 100644 --- a/waku/waku_rln_relay/rln_relay.nim +++ b/waku/waku_rln_relay/rln_relay.nim @@ -382,12 +382,10 @@ proc generateRlnValidator*( let proof = toHex(msgProof.proof) - epoch = fromEpoch(msgProof.epoch) root = inHex(msgProof.merkleRoot) shareX = inHex(msgProof.shareX) shareY = inHex(msgProof.shareY) nullifier = inHex(msgProof.nullifier) - payload = string.fromBytes(message.payload) case validationRes of Valid: trace "message validity is verified, relaying:",