fix: fixed multiple bare except warnings

apps/wakubridge/wakubridge.nim

@@ -339,7 +339,7 @@ when isMainModule:
 
   # Adhere to NO_COLOR initiative: https://no-color.org/
   let color = try: not parseBool(os.getEnv("NO_COLOR", "false"))
-              except: true
+              except CatchableError: true
 
   logging.setupLogLevel(conf.logLevel)
   logging.setupLogFormat(conf.logFormat, color)

apps/wakunode2/config.nim

@@ -451,7 +451,7 @@ proc parseCmdArg*(T: type crypto.PrivateKey, p: string): T =
   try:
     let key = SkPrivateKey.init(utils.fromHex(p)).tryGet()
     crypto.PrivateKey(scheme: Secp256k1, skkey: key)
-  except:
+  except CatchableError:
     raise newException(ConfigurationError, "Invalid private key")
 
 proc completeCmdArg*(T: type crypto.PrivateKey, val: string): seq[string] =
@@ -461,7 +461,7 @@ proc completeCmdArg*(T: type crypto.PrivateKey, val: string): seq[string] =
 proc parseCmdArg*(T: type ValidIpAddress, p: string): T =
   try:
     ValidIpAddress.init(p)
-  except:
+  except CatchableError:
     raise newException(ConfigurationError, "Invalid IP address")
 
 proc completeCmdArg*(T: type ValidIpAddress, val: string): seq[string] =
@@ -476,7 +476,7 @@ proc defaultListenAddress*(): ValidIpAddress =
 proc parseCmdArg*(T: type Port, p: string): T =
   try:
     Port(parseInt(p))
-  except:
+  except CatchableError:
     raise newException(ConfigurationError, "Invalid Port number")
 
 proc completeCmdArg*(T: type Port, val: string): seq[string] =
@@ -485,7 +485,7 @@ proc completeCmdArg*(T: type Port, val: string): seq[string] =
 proc parseCmdArg*(T: type Option[int], p: string): T =
   try:
     some(parseInt(p))
-  except:
+  except CatchableError:
     raise newException(ConfigurationError, "Invalid number")
 
 ## Configuration validation

apps/wakunode2/wakunode2.nim

@@ -608,7 +608,7 @@ when isMainModule:
 
   # Adhere to NO_COLOR initiative: https://no-color.org/
   let color = try: not parseBool(os.getEnv("NO_COLOR", "false"))
-              except: true
+              except CatchableError: true
 
   logging.setupLogLevel(conf.logLevel)
   logging.setupLogFormat(conf.logFormat, color)

tests/v2/waku_rln_relay/test_rln_group_manager_onchain.nim

@@ -133,11 +133,11 @@ proc runGanache(): Process =
           ganacheStartLog.add(cmdline)
           if cmdline.contains("Listening on 127.0.0.1:8540"):
             break
-      except:
+      except CatchableError:
         break
     debug "Ganache daemon is running and ready", pid=ganachePID, startLog=ganacheStartLog
     return runGanache
-  except:
+  except:  # TODO: Fix "BareExcept" warning
     error "Ganache daemon run failed"
 
 
@@ -153,7 +153,7 @@ proc stopGanache(runGanache: Process) {.used.} =
     # ref: https://nim-lang.org/docs/osproc.html#waitForExit%2CProcess%2Cint
     # debug "ganache logs", logs=runGanache.outputstream.readAll()
     debug "Sent SIGTERM to Ganache", ganachePID=ganachePID
-  except:
+  except CatchableError:
     error "Ganache daemon termination failed: ", err = getCurrentExceptionMsg()
 
 proc setup(signer = true): Future[OnchainGroupManager] {.async.} =

tools/networkmonitor/networkmonitor.nim

@@ -151,7 +151,7 @@ proc populateInfoFromIp(allPeersRef: CustomPeersTableRef,
       await sleepAsync(1400)
       let response = await restClient.ipToLocation(allPeersRef[peer].ip)
       location = response.data
-    except:
+    except CatchableError:
       warn "could not get location", ip=allPeersRef[peer].ip
       continue
     allPeersRef[peer].country = location.country
@@ -214,7 +214,7 @@ proc getBootstrapFromDiscDns(conf: NetworkMonitorConf): Result[seq[enr.Record],
         if tenrRes.isOk() and (tenrRes.get().udp.isSome() or tenrRes.get().udp6.isSome()):
           discv5BootstrapEnrs.add(enr)
     return ok(discv5BootstrapEnrs)
-  except:
+  except CatchableError:
     error("failed discovering peers from DNS")
 
 proc initAndStartNode(conf: NetworkMonitorConf): Result[WakuNode, string] =
@@ -249,7 +249,7 @@ proc initAndStartNode(conf: NetworkMonitorConf): Result[WakuNode, string] =
 
     node.wakuDiscv5.protocol.open()
     return ok(node)
-  except:
+  except CatchableError:
     error("could not start node")
 
 proc startRestApiServer(conf: NetworkMonitorConf,
@@ -266,7 +266,7 @@ proc startRestApiServer(conf: NetworkMonitorConf,
     var sres = RestServerRef.new(router, serverAddress)
     let restServer = sres.get()
     restServer.start()
-  except:
+  except CatchableError:
     error("could not start rest api server")
   ok()
 

tools/networkmonitor/networkmonitor_utils.nim

@@ -44,7 +44,7 @@ proc decodeBytes*(t: typedesc[NodeLocation], value: openArray[byte],
         long:    $jsonContent["lon"].getFloat(),
         isp:     jsonContent["isp"].getStr()
       ))
-    except:
+    except CatchableError:
       return err("failed to get the location: " & getCurrentExceptionMsg())
 
 proc encodeString*(value: string): RestResult[string] =

waku/common/logging.nim

@@ -24,7 +24,7 @@ converter toChroniclesLogLevel(level: LogLevel): chronicles.LogLevel =
   ## Map logging log levels to the corresponding nim-chronicles' log level
   try:
     parseEnum[chronicles.LogLevel]($level)
-  except:
+  except CatchableError:
     chronicles.LogLevel.NONE
 
 
@@ -71,7 +71,7 @@ proc writeAndFlush(f: File, s: LogOutputStr) =
   try:
     f.write(s)
     f.flushFile()
-  except:
+  except CatchableError:
     logLoggingFailure(cstring(s), getCurrentException())
 
 

waku/v2/node/rest/relay/types.nim

@@ -88,7 +88,7 @@ proc readValue*(reader: var JsonReader[RestJson], value: var RelayWakuMessage)
     # Check for reapeated keys
     if keys.containsOrIncl(fieldName):
       let err = try: fmt"Multiple `{fieldName}` fields found"
-                except: "Multiple fields with the same name found"
+                except CatchableError: "Multiple fields with the same name found"
       reader.raiseUnexpectedField(err, "RelayWakuMessage")
 
     case fieldName

waku/v2/protocol/waku_archive/driver/queue_driver/queue_driver.nim

@@ -255,7 +255,7 @@ method getMessages*(
 ): ArchiveDriverResult[seq[ArchiveRow]] =
   let cursor = cursor.map(toIndex)
 
-  let matchesQuery: QueryFilterMatcher = proc(row: IndexedWakuMessage): bool =
+  let matchesQuery: QueryFilterMatcher = func(row: IndexedWakuMessage): bool =
     if pubsubTopic.isSome() and row.pubsubTopic != pubsubTopic.get():
       return false
 
@@ -273,7 +273,7 @@ method getMessages*(
   var pageRes: QueueDriverGetPageResult
   try:
     pageRes = driver.getPage(maxPageSize, ascendingOrder, cursor, matchesQuery)
-  except:
+  except:  # TODO: Fix "BareExcept" warning
     return err(getCurrentExceptionMsg())
 
   if pageRes.isErr():

waku/v2/protocol/waku_filter/client.nim

@@ -47,7 +47,7 @@ proc clear(m: var SubscriptionManager) =
 proc registerSubscription(m: SubscriptionManager, pubsubTopic: PubsubTopic, contentTopic: ContentTopic, handler: FilterPushHandler) =
   try:
     m.subscriptions[(pubsubTopic, contentTopic)]= handler
-  except:
+  except:  # TODO: Fix "BareExcept" warning
     error "failed to register filter subscription", error=getCurrentExceptionMsg()
 
 proc removeSubscription(m: SubscriptionManager, pubsubTopic: PubsubTopic, contentTopic: ContentTopic) =
@@ -60,7 +60,7 @@ proc notifySubscriptionHandler(m: SubscriptionManager, pubsubTopic: PubsubTopic,
   try:
     let handler = m.subscriptions[(pubsubTopic, contentTopic)]
     handler(pubsubTopic, message)
-  except:
+  except:  # TODO: Fix "BareExcept" warning
     discard
 
 proc getSubscriptionsCount(m: SubscriptionManager): int =

waku/v2/protocol/waku_keystore/keystore.nim

@@ -183,7 +183,7 @@ proc addMembershipCredentials*(path: string,
           # We add it to the credentials field of the keystore
           jsonKeystore["credentials"].add(keyfileRes.get())
 
-  except:
+  except CatchableError:
     return err(KeystoreJsonError)
 
   # We save to disk the (updated) keystore.
@@ -235,7 +235,7 @@ proc getMembershipCredentials*(path: string,
               if filteredCredentialOpt.isSome():
                 outputMembershipCredentials.add(filteredCredentialOpt.get())
 
-  except:
+  except CatchableError:
     return err(KeystoreJsonError)
 
   return ok(outputMembershipCredentials)

waku/v2/protocol/waku_keystore/utils.nim

@@ -25,7 +25,7 @@ proc save*(json: JsonNode, path: string, separator: string): KeystoreResult[void
   if fileExists(path):
     try:
       moveFile(path, path & ".bkp")
-    except:
+    except:  # TODO: Fix "BareExcept" warning
       return err(KeystoreOsError)
 
   # We save the updated json
@@ -45,7 +45,7 @@ proc save*(json: JsonNode, path: string, separator: string): KeystoreResult[void
         f.close()
         removeFile(path)
         moveFile(path & ".bkp", path)
-      except:
+      except:  # TODO: Fix "BareExcept" warning
         # Unlucky, we just fail
         return err(KeystoreOsError)
     return err(KeystoreOsError)
@@ -56,7 +56,7 @@ proc save*(json: JsonNode, path: string, separator: string): KeystoreResult[void
   if fileExists(path & ".bkp"):
     try:
       removeFile(path & ".bkp")
-    except:
+    except CatchableError:
       return err(KeystoreOsError)
 
   return ok()

waku/v2/protocol/waku_noise/noise_handshake_processing.nim

@@ -487,7 +487,7 @@ proc stepHandshake*(rng: var rand.HmacDrbgContext, hs: var HandshakeState, readP
     # We initialize a payload v2 and we set proper protocol ID (if supported)
     try:
       hsStepResult.payload2.protocolId = PayloadV2ProtocolIDs[hs.handshakePattern.name]
-    except:
+    except CatchableError:
       raise newException(NoiseMalformedHandshake, "Handshake Pattern not supported")
 
     # We set the messageNametag and the handshake and transport messages

waku/v2/protocol/waku_noise/noise_utils.nim

@@ -189,7 +189,7 @@ proc print*(self: HandshakePattern)
           stdout.write ", ", token
       stdout.write "\n"
       stdout.flushFile()
-  except:
+  except CatchableError:
     raise newException(NoiseMalformedHandshake, "HandshakePattern malformed")
 
 # Hashes a Noise protocol name using SHA256

waku/v2/protocol/waku_rln_relay/group_manager/on_chain/group_manager.nim

@@ -175,7 +175,7 @@ proc parseEvent*(event: type MemberRegistered,
     # Parse the index
     offset += decode(data, offset, index)
     return ok(Membership(idCommitment: idComm.toIDCommitment(), index: index.toMembershipIndex()))
-  except:
+  except CatchableError:
     return err("failed to parse the data field of the MemberRegistered event")
 
 type BlockTable* = OrderedTable[BlockNumber, seq[Membership]]
@@ -298,7 +298,7 @@ proc startListeningToEvents*(g: OnchainGroupManager): Future[void] {.async.} =
   let newHeadCallback = g.getNewHeadCallback()
   try:
     discard await ethRpc.subscribeForBlockHeaders(newHeadCallback, newHeadErrCallback)
-  except:
+  except CatchableError:
     raise newException(ValueError, "failed to subscribe to block headers: " & getCurrentExceptionMsg())
 
 proc startOnchainSync*(g: OnchainGroupManager, fromBlock: BlockNumber = BlockNumber(0)): Future[void] {.async.} =
@@ -306,13 +306,13 @@ proc startOnchainSync*(g: OnchainGroupManager, fromBlock: BlockNumber = BlockNum
 
   try:
     await g.getEventsAndSeedIntoTree(fromBlock, some(fromBlock))
-  except:
+  except CatchableError:
     raise newException(ValueError, "failed to get the history/reconcile missed blocks: " & getCurrentExceptionMsg())
 
   # listen to blockheaders and contract events
   try:
     await g.startListeningToEvents()
-  except:
+  except CatchableError:
     raise newException(ValueError, "failed to start listening to events: " & getCurrentExceptionMsg())
 
 proc persistCredentials*(g: OnchainGroupManager): GroupManagerResult[void] =
@@ -358,7 +358,7 @@ method startGroupSync*(g: OnchainGroupManager): Future[void] {.async.} =
   # Get archive history
   try:
     await startOnchainSync(g)
-  except:
+  except CatchableError:
     raise newException(ValueError, "failed to start onchain sync service: " & getCurrentExceptionMsg())
 
   if g.ethPrivateKey.isSome() and g.idCredentials.isNone():
@@ -393,7 +393,7 @@ method init*(g: OnchainGroupManager): Future[void] {.async.} =
   # check if the Ethereum client is reachable
   try:
     ethRpc = await newWeb3(g.ethClientUrl)
-  except:
+  except CatchableError:
     raise newException(ValueError, "could not connect to the Ethereum client")
 
   # Set the chain id
@@ -416,7 +416,7 @@ method init*(g: OnchainGroupManager): Future[void] {.async.} =
   var membershipFee: Uint256
   try:
     membershipFee = await contract.MEMBERSHIP_DEPOSIT().call()
-  except:
+  except CatchableError:
     raise newException(ValueError, "could not get the membership deposit")
 
 
@@ -445,7 +445,7 @@ method init*(g: OnchainGroupManager): Future[void] {.async.} =
     info "reconnecting with the Ethereum client, and restarting group sync", fromBlock = fromBlock
     try:
       asyncSpawn g.startOnchainSync(fromBlock)
-    except:
+    except CatchableError:
       error "failed to restart group sync", error = getCurrentExceptionMsg()
 
   g.initialized = true