chore: remove all pre-nim-1.6 deadcode from codebase (#2857)

apps/chat2/chat2.nim

@@ -4,10 +4,7 @@
 when not (compileOption("threads")):
   {.fatal: "Please, compile this program with the --threads:on option!".}
 
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/[strformat, strutils, times, options, random]
 import

apps/chat2bridge/chat2bridge.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[tables, times, strutils, hashes, sequtils],

apps/liteprotocoltester/liteprotocoltester.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[options, strutils, os, sequtils, net],

apps/liteprotocoltester/statistics.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[sets, tables, strutils, sequtils, options, strformat],

apps/liteprotocoltester/tester_message.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   chronicles,

apps/networkmonitor/networkmonitor.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[tables, strutils, times, sequtils, random],

apps/networkmonitor/networkmonitor_metrics.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[json, tables, sequtils],

apps/networkmonitor/networkmonitor_utils.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/json,

apps/wakunode2/wakunode2.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[options, strutils, sequtils, net],

examples/wakustealthcommitments/erc_5564_interface.nim

@@ -1,8 +1,5 @@
 ## Nim wrappers for the functions defined in librln
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import stew/results
 

examples/wakustealthcommitments/node_spec.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   ../../waku/common/logging, ../../waku/factory/[waku, networks_config, external_config]

examples/wakustealthcommitments/stealth_commitment_protocol.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   stew/results,

examples/wakustealthcommitments/wakustealthcommitments.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   stew/results, chronicles, ./node_spec as Waku, ./stealth_commitment_protocol as SCP

tests/waku_rln_relay/test_rln_group_manager_onchain.nim

@@ -1,9 +1,6 @@
 {.used.}
 
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[options, os, osproc, sequtils, deques, streams, strutils, tempfiles, strformat],

tests/waku_rln_relay/test_rln_group_manager_static.nim

@@ -1,9 +1,6 @@
 {.used.}
 
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   testutils/unittests,

tests/waku_rln_relay/test_rln_serde.nim

@@ -1,9 +1,6 @@
 {.used.}
 
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   ./rln/waku_rln_relay_utils,

waku/common/base64.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import stew/[results, byteutils, base64]
 

waku/common/confutils/envvar/defs.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import confutils/defs as confutilsDefs
 import ../../envvar_serialization

waku/common/confutils/envvar/std/net.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/[strutils, net]
 import ../../../envvar_serialization

waku/common/databases/db_postgres/pgasyncpool.nim

@@ -1,9 +1,6 @@
 # Simple async pool driver for postgress.
 # Inspired by: https://github.com/treeform/pg/
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/[sequtils, nre, strformat, sets], stew/results, chronos
 import ./dbconn, ../common

waku/common/enr/builder.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[options, net],

waku/common/enr/typed_record.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/options, stew/results, eth/keys as eth_keys, libp2p/crypto/crypto as libp2p_crypto

waku/common/envvar_serialization.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import stew/shims/macros, serialization
 import ./envvar_serialization/reader, ./envvar_serialization/writer

waku/common/envvar_serialization/reader.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[tables, typetraits, options, os],

waku/common/envvar_serialization/utils.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/[os, strutils], stew/byteutils, stew/ptrops
 

waku/common/hexstrings.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 type
   HexDataStr* = distinct string

waku/common/logging.nim

@@ -8,10 +8,7 @@ import
 
 export chronicles.LogLevel
 
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 type LogFormat* = enum
   TEXT

waku/common/nimchronos.nim

@@ -1,8 +1,5 @@
 ## An extension wrapper around nim-chronos
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import chronos, chronicles
 

waku/common/protobuf.nim

@@ -1,9 +1,6 @@
 # Extensions for libp2p's protobuf library implementation
 
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/options, libp2p/protobuf/minprotobuf, libp2p/varint
 

waku/common/ratelimit.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/options, chronos/timer, libp2p/stream/connection
 

waku/common/tokenbucket.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import chronos
 

waku/common/utils/matterbridge_client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/[httpclient, json, uri, options], stew/results
 

waku/common/utils/nat.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/[options, strutils, net]
 import chronicles, eth/net/nat, stew/results, nativesockets

waku/common/utils/sequence.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 proc flatten*[T](a: seq[seq[T]]): seq[T] =
   var aFlat = newSeq[T](0)

waku/common/waku_service_metrics.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import metrics
 

waku/discovery/waku_discv5.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[sequtils, strutils, options, sets, net, json],

waku/discovery/waku_dnsdisc.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 ## A set of utilities to integrate EIP-1459 DNS-based discovery
 ## for Waku v2 nodes.

waku/factory/builder.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[options, net],

waku/factory/networks_config.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 type ClusterConf* = object
   maxMessageSize*: string

waku/factory/validator_signed.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   chronicles,

waku/factory/waku.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[options, sequtils],

waku/node/config.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[options, sequtils, strutils, net],

waku/node/health_monitor.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/[options], chronos
 

waku/node/peer_manager/peer_manager.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[options, sets, sequtils, times, strutils, math, random],

waku/node/peer_manager/peer_store/migrations.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/[tables, strutils, os], stew/results, chronicles
 import ../../../common/databases/db_sqlite, ../../../common/databases/common

waku/node/peer_manager/peer_store/peer_storage.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import stew/results
 import ../../../waku_core, ../waku_peer_store

waku/node/peer_manager/peer_store/waku_peer_storage.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[sets, options],

waku/node/peer_manager/waku_peer_store.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[tables, sequtils, sets, options, strutils],

waku/node/waku_metrics.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import chronicles, chronos, metrics, metrics/chronos_httpserver
 import

waku/node/waku_node.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[hashes, options, sugar, tables, strutils, sequtils, os, net],

waku/node/waku_switch.nim

@@ -1,8 +1,5 @@
 # Waku Switch utils.
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/options,

waku/utils/collector.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import metrics
 

waku/utils/noise.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import stew/results
 import ../waku_core, ../waku_noise/noise_types, ../waku_noise/noise_utils

waku/utils/requests.nim

@@ -1,9 +1,6 @@
 # Request utils.
 
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import bearssl/rand, stew/byteutils
 

waku/waku_api/handlers.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import chronos, std/[options, sequtils], stew/results
 import ../discovery/waku_discv5, ../waku_relay, ../waku_core, ./message_cache

waku/waku_api/message_cache.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[sequtils, sugar, algorithm, options],

waku/waku_api/rest/admin/client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   chronicles,

waku/waku_api/rest/admin/handlers.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[strformat, sequtils, tables],

waku/waku_api/rest/admin/types.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   chronicles,

waku/waku_api/rest/builder.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import net, tables
 import presto

waku/waku_api/rest/client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import presto/client
 

waku/waku_api/rest/debug/client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   chronicles, json_serialization, json_serialization/std/options, presto/[route, client]

waku/waku_api/rest/debug/handlers.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import chronicles, json_serialization, presto/route
 import ../../../waku_node, ../responses, ../serdes, ./types

waku/waku_api/rest/debug/types.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import chronicles, json_serialization, json_serialization/std/options
 import ../../../waku_node, ../serdes

waku/waku_api/rest/filter/client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   json,

waku/waku_api/rest/filter/handlers.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/strformat,

waku/waku_api/rest/filter/types.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[sets, strformat],

waku/waku_api/rest/health/client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   chronicles, json_serialization, json_serialization/std/options, presto/[route, client]

waku/waku_api/rest/health/handlers.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import chronicles, json_serialization, presto/route
 import ../../../waku_node, ../responses, ../serdes, ./types

waku/waku_api/rest/health/types.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import chronicles, json_serialization, json_serialization/std/options
 import ../../../waku_node, ../serdes

waku/waku_api/rest/legacy_store/client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   chronicles, json_serialization, json_serialization/std/options, presto/[route, client]

waku/waku_api/rest/legacy_store/handlers.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/strformat, stew/results, chronicles, uri, json_serialization, presto/route
 import

waku/waku_api/rest/legacy_store/types.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[sets, strformat, uri],

waku/waku_api/rest/lightpush/client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   json,

waku/waku_api/rest/lightpush/handlers.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/strformat,

waku/waku_api/rest/lightpush/types.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[sets, strformat],

waku/waku_api/rest/origin_handler.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[options, strutils, re, net],

waku/waku_api/rest/relay/client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/sets,

waku/waku_api/rest/relay/handlers.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/sequtils,

waku/waku_api/rest/relay/types.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[sets, strformat, times],

waku/waku_api/rest/responses.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/typetraits, stew/results, chronicles, presto/common
 import ./serdes

waku/waku_api/rest/rest_serdes.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/typetraits,

waku/waku_api/rest/serdes.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/typetraits,

waku/waku_api/rest/server.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/net
 import

waku/waku_api/rest/store/client.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   chronicles, json_serialization, json_serialization/std/options, presto/[route, client]

waku/waku_api/rest/store/handlers.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/strformat, stew/results, chronicles, uri, json_serialization, presto/route
 import

waku/waku_api/rest/store/types.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[sets, strformat, uri, options, sequtils],

waku/waku_archive/archive.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[times, options, sequtils, strutils, algorithm],

waku/waku_archive/archive_metrics.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import metrics
 

waku/waku_archive/common.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/options, stew/results, stew/byteutils, stew/arrayops, nimcrypto/sha2
 import ../waku_core, ../common/paging

waku/waku_archive/driver.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/options, stew/results, chronos
 import ../waku_core, ./common

waku/waku_archive/driver/builder.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import stew/results, chronicles, chronos
 import

waku/waku_archive/driver/postgres_driver.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   ./postgres_driver/postgres_driver,

waku/waku_archive/driver/postgres_driver/postgres_driver.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import
   std/[nre, options, sequtils, strutils, strformat, times],

waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import chronos, stew/results
 import ../../../common/databases/db_postgres, ../../../common/error_handling

waku/waku_archive/driver/queue_driver.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import ./queue_driver/queue_driver, ./queue_driver/index
 

waku/waku_archive/driver/queue_driver/index.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import stew/byteutils, nimcrypto/sha2
 import ../../../waku_core, ../../common

waku/waku_archive/driver/queue_driver/queue_driver.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import std/options, stew/results, stew/sorted_set, chronicles, chronos
 import ../../../waku_core, ../../common, ../../driver, ./index

waku/waku_archive/driver/sqlite_driver.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import ./sqlite_driver/sqlite_driver
 

waku/waku_archive/driver/sqlite_driver/cursor.nim

@@ -1,7 +1,4 @@
-when (NimMajor, NimMinor) < (1, 4):
+{.push raises: [].}
-  {.push raises: [Defect].}
-else:
-  {.push raises: [].}
 
 import ../../../waku_core, ../../common