Skip to content

Commit

Permalink
chore: remove all pre-nim-1.6 deadcode from codebase (#2857)
Browse files Browse the repository at this point in the history
  • Loading branch information
darshankabariya authored Jun 28, 2024
1 parent 092add1 commit 9bd8c33
Show file tree
Hide file tree
Showing 171 changed files with 171 additions and 684 deletions.
5 changes: 1 addition & 4 deletions apps/chat2/chat2.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import std/[strformat, strutils, times, options, random]
import
Expand Down
5 changes: 1 addition & 4 deletions apps/chat2bridge/chat2bridge.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[tables, times, strutils, hashes, sequtils],
Expand Down
5 changes: 1 addition & 4 deletions apps/liteprotocoltester/liteprotocoltester.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[options, strutils, os, sequtils, net],
Expand Down
5 changes: 1 addition & 4 deletions apps/liteprotocoltester/statistics.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[sets, tables, strutils, sequtils, options, strformat],
Expand Down
5 changes: 1 addition & 4 deletions apps/liteprotocoltester/tester_message.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
chronicles,
Expand Down
5 changes: 1 addition & 4 deletions apps/networkmonitor/networkmonitor.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[tables, strutils, times, sequtils, random],
Expand Down
5 changes: 1 addition & 4 deletions apps/networkmonitor/networkmonitor_metrics.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[json, tables, sequtils],
Expand Down
5 changes: 1 addition & 4 deletions apps/networkmonitor/networkmonitor_utils.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/json,
Expand Down
5 changes: 1 addition & 4 deletions apps/wakunode2/wakunode2.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[options, strutils, sequtils, net],
Expand Down
5 changes: 1 addition & 4 deletions examples/wakustealthcommitments/erc_5564_interface.nim
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
## Nim wrappers for the functions defined in librln
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import stew/results

Expand Down
5 changes: 1 addition & 4 deletions examples/wakustealthcommitments/node_spec.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
../../waku/common/logging, ../../waku/factory/[waku, networks_config, external_config]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
stew/results,
Expand Down
5 changes: 1 addition & 4 deletions examples/wakustealthcommitments/wakustealthcommitments.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
stew/results, chronicles, ./node_spec as Waku, ./stealth_commitment_protocol as SCP
Expand Down
5 changes: 1 addition & 4 deletions tests/waku_rln_relay/test_rln_group_manager_onchain.nim
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{.used.}

when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[options, os, osproc, sequtils, deques, streams, strutils, tempfiles, strformat],
Expand Down
5 changes: 1 addition & 4 deletions tests/waku_rln_relay/test_rln_group_manager_static.nim
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{.used.}

when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
testutils/unittests,
Expand Down
5 changes: 1 addition & 4 deletions tests/waku_rln_relay/test_rln_serde.nim
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{.used.}

when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
./rln/waku_rln_relay_utils,
Expand Down
5 changes: 1 addition & 4 deletions waku/common/base64.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import stew/[results, byteutils, base64]

Expand Down
5 changes: 1 addition & 4 deletions waku/common/confutils/envvar/defs.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import confutils/defs as confutilsDefs
import ../../envvar_serialization
Expand Down
5 changes: 1 addition & 4 deletions waku/common/confutils/envvar/std/net.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import std/[strutils, net]
import ../../../envvar_serialization
Expand Down
5 changes: 1 addition & 4 deletions waku/common/databases/db_postgres/pgasyncpool.nim
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Simple async pool driver for postgress.
# Inspired by: https://github.com/treeform/pg/
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import std/[sequtils, nre, strformat, sets], stew/results, chronos
import ./dbconn, ../common
Expand Down
5 changes: 1 addition & 4 deletions waku/common/enr/builder.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[options, net],
Expand Down
5 changes: 1 addition & 4 deletions waku/common/enr/typed_record.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/options, stew/results, eth/keys as eth_keys, libp2p/crypto/crypto as libp2p_crypto
Expand Down
5 changes: 1 addition & 4 deletions waku/common/envvar_serialization.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import stew/shims/macros, serialization
import ./envvar_serialization/reader, ./envvar_serialization/writer
Expand Down
5 changes: 1 addition & 4 deletions waku/common/envvar_serialization/reader.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[tables, typetraits, options, os],
Expand Down
5 changes: 1 addition & 4 deletions waku/common/envvar_serialization/utils.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import std/[os, strutils], stew/byteutils, stew/ptrops

Expand Down
5 changes: 1 addition & 4 deletions waku/common/hexstrings.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

type
HexDataStr* = distinct string
Expand Down
5 changes: 1 addition & 4 deletions waku/common/logging.nim
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import

export chronicles.LogLevel

when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

type LogFormat* = enum
TEXT
Expand Down
5 changes: 1 addition & 4 deletions waku/common/nimchronos.nim
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
## An extension wrapper around nim-chronos
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import chronos, chronicles

Expand Down
5 changes: 1 addition & 4 deletions waku/common/protobuf.nim
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Extensions for libp2p's protobuf library implementation

when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import std/options, libp2p/protobuf/minprotobuf, libp2p/varint

Expand Down
5 changes: 1 addition & 4 deletions waku/common/ratelimit.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import std/options, chronos/timer, libp2p/stream/connection

Expand Down
5 changes: 1 addition & 4 deletions waku/common/tokenbucket.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import chronos

Expand Down
5 changes: 1 addition & 4 deletions waku/common/utils/matterbridge_client.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import std/[httpclient, json, uri, options], stew/results

Expand Down
5 changes: 1 addition & 4 deletions waku/common/utils/nat.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import std/[options, strutils, net]
import chronicles, eth/net/nat, stew/results, nativesockets
Expand Down
5 changes: 1 addition & 4 deletions waku/common/utils/sequence.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

proc flatten*[T](a: seq[seq[T]]): seq[T] =
var aFlat = newSeq[T](0)
Expand Down
5 changes: 1 addition & 4 deletions waku/common/waku_service_metrics.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import metrics

Expand Down
5 changes: 1 addition & 4 deletions waku/discovery/waku_discv5.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[sequtils, strutils, options, sets, net, json],
Expand Down
5 changes: 1 addition & 4 deletions waku/discovery/waku_dnsdisc.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

## A set of utilities to integrate EIP-1459 DNS-based discovery
## for Waku v2 nodes.
Expand Down
5 changes: 1 addition & 4 deletions waku/factory/builder.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[options, net],
Expand Down
5 changes: 1 addition & 4 deletions waku/factory/networks_config.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

type ClusterConf* = object
maxMessageSize*: string
Expand Down
5 changes: 1 addition & 4 deletions waku/factory/validator_signed.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
chronicles,
Expand Down
5 changes: 1 addition & 4 deletions waku/factory/waku.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[options, sequtils],
Expand Down
5 changes: 1 addition & 4 deletions waku/node/config.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
when (NimMajor, NimMinor) < (1, 4):
{.push raises: [Defect].}
else:
{.push raises: [].}
{.push raises: [].}

import
std/[options, sequtils, strutils, net],
Expand Down
Loading

0 comments on commit 9bd8c33

Please sign in to comment.