Merge 13921f1 into f0f9441

waku-org · May 16, 2024 · dc59888 · dc59888
2 parents f0f9441 + 13921f1
commit dc59888
Show file tree

Hide file tree

Showing 47 changed files with 179 additions and 166 deletions.
diff --git a/apps/wakunode2/wakunode2.nim b/apps/wakunode2/wakunode2.nim
@@ -4,8 +4,7 @@ else:
   {.push raises: [].}
 
 import
-  std/[options, strutils, os, sequtils],
-  stew/shims/net as stewNet,
+  std/[options, strutils, os, sequtils, net],
   chronicles,
   chronos,
   metrics,

diff --git a/tests/waku_store_legacy/test_wakunode_store.nim b/tests/waku_store_legacy/test_wakunode_store.nim
@@ -31,7 +31,7 @@ import
   ../testlib/wakucore,
   ../testlib/wakunode
 
-procSuite "WakuNode - Store":
+procSuite "WakuNode - Store Legacy":
   ## Fixtures
   let timeOrigin = now()
   let msgListA =

diff --git a/tests/wakunode2/test_app.nim b/tests/wakunode2/test_app.nim
@@ -9,7 +9,11 @@ import
   libp2p/crypto/secp,
   libp2p/multiaddress,
   libp2p/switch
-import ../testlib/common, ../testlib/wakucore, ../testlib/wakunode
+import
+  ../testlib/common,
+  ../testlib/wakucore,
+  ../testlib/wakunode,
+  ../../waku/node/waku_metrics
 
 include ../../waku/factory/waku
 

diff --git a/waku/common/confutils/envvar/std/net.nim b/waku/common/confutils/envvar/std/net.nim
@@ -3,7 +3,7 @@ when (NimMajor, NimMinor) < (1, 4):
 else:
   {.push raises: [].}
 
-import std/strutils, stew/shims/net
+import std/[strutils, net]
 import ../../../envvar_serialization
 
 export net, envvar_serialization

diff --git a/waku/common/databases/db_postgres/dbconn.nim b/waku/common/databases/db_postgres/dbconn.nim
@@ -1,4 +1,4 @@
-import std/[times, strutils, strformat], stew/results, chronos
+import std/[times, strutils], stew/results, chronos
 
 include db_postgres
 

diff --git a/waku/common/databases/dburl.nim b/waku/common/databases/dburl.nim
@@ -3,7 +3,7 @@ import std/strutils, regex, stew/results
 proc validateDbUrl*(dbUrl: string): Result[string, string] =
   ## dbUrl mimics SQLAlchemy Database URL schema
   ## See: https://docs.sqlalchemy.org/en/14/core/engines.html#database-urls
-  let regex = re"^\w+:\/\/.+:.+@[\w*-.]+:[0-9]+\/[\w*-.]+$"
+  let regex = re2"^\w+:\/\/.+:.+@[\w*-.]+:[0-9]+\/[\w*-.]+$"
   let dbUrl = dbUrl.strip()
   if "sqlite" in dbUrl or dbUrl == "" or dbUrl == "none" or dbUrl.match(regex):
     return ok(dbUrl)

diff --git a/waku/common/enr/builder.nim b/waku/common/enr/builder.nim
@@ -4,9 +4,8 @@ else:
   {.push raises: [].}
 
 import
-  std/options,
+  std/[options, net],
   stew/results,
-  stew/shims/net,
   eth/keys as eth_keys,
   eth/p2p/discoveryv5/enr,
   libp2p/crypto/crypto as libp2p_crypto

diff --git a/waku/common/logging.nim b/waku/common/logging.nim
@@ -1,10 +1,6 @@
 ## This code has been copied and addapted from `status-im/nimbu-eth2` project.
 ## Link: https://github.com/status-im/nimbus-eth2/blob/c585b0a5b1ae4d55af38ad7f4715ad455e791552/beacon_chain/nimbus_binary_common.nim
-import
-  std/[strutils, typetraits],
-  chronicles,
-  chronicles/log_output,
-  chronicles/topics_registry
+import std/typetraits, chronicles, chronicles/log_output, chronicles/topics_registry
 
 export chronicles.LogLevel
 

diff --git a/waku/common/utils/nat.nim b/waku/common/utils/nat.nim
@@ -3,8 +3,8 @@ when (NimMajor, NimMinor) < (1, 4):
 else:
   {.push raises: [].}
 
-import std/[options, strutils]
-import chronicles, eth/net/nat, stew/results, stew/shims/net, nativesockets
+import std/[options, strutils, net]
+import chronicles, eth/net/nat, stew/results, nativesockets
 
 logScope:
   topics = "nat"

diff --git a/waku/common/utils/sequence.nim b/waku/common/utils/sequence.nim
@@ -3,8 +3,6 @@ when (NimMajor, NimMinor) < (1, 4):
 else:
   {.push raises: [].}
 
-import std/sequtils
-
 proc flatten*[T](a: seq[seq[T]]): seq[T] =
   var aFlat = newSeq[T](0)
   for subseq in a:

diff --git a/waku/discovery/waku_discv5.nim b/waku/discovery/waku_discv5.nim
@@ -4,9 +4,8 @@ else:
   {.push raises: [].}
 
 import
-  std/[sequtils, strutils, options, sets],
+  std/[sequtils, strutils, options, sets, net],
   stew/results,
-  stew/shims/net,
   chronos,
   chronicles,
   metrics,

diff --git a/waku/discovery/waku_dnsdisc.nim b/waku/discovery/waku_dnsdisc.nim
@@ -9,8 +9,7 @@ else:
 ## EIP-1459 is defined in https://eips.ethereum.org/EIPS/eip-1459
 
 import
-  std/options,
-  stew/shims/net,
+  std/[options, net],
   chronicles,
   chronos,
   metrics,

diff --git a/waku/factory/builder.nim b/waku/factory/builder.nim
@@ -4,9 +4,8 @@ else:
   {.push raises: [].}
 
 import
-  std/options,
+  std/[options, net],
   stew/results,
-  stew/shims/net,
   chronicles,
   libp2p/crypto/crypto,
   libp2p/builders,

diff --git a/waku/factory/external_config.nim b/waku/factory/external_config.nim
@@ -764,8 +764,6 @@ proc readValue*(
   except CatchableError:
     raise newException(SerializationError, getCurrentExceptionMsg())
 
-{.push warning[ProveInit]: off.}
-
 proc load*(T: type WakuNodeConf, version = ""): ConfResult[T] =
   try:
     let conf = WakuNodeConf.load(
@@ -789,5 +787,3 @@ proc defaultWakuNodeConf*(): ConfResult[WakuNodeConf] =
     return ok(conf)
   except CatchableError:
     return err("exception in defaultWakuNodeConf: " & getCurrentExceptionMsg())
-
-{.pop.}
diff --git a/waku/factory/internal_config.nim b/waku/factory/internal_config.nim
@@ -4,9 +4,8 @@ import
   libp2p/crypto/crypto,
   libp2p/multiaddress,
   libp2p/nameresolving/dnsresolver,
-  std/[options, sequtils],
-  stew/results,
-  stew/shims/net
+  std/[options, sequtils, net],
+  stew/results
 import
   ./external_config,
   ../common/utils/nat,

diff --git a/waku/factory/validator_signed.nim b/waku/factory/validator_signed.nim
@@ -4,14 +4,12 @@ else:
   {.push raises: [].}
 
 import
-  std/math,
   chronicles,
   chronos,
   metrics,
   stew/byteutils,
   stew/endians2,
   libp2p/protocols/pubsub/gossipsub,
-  libp2p/protocols/pubsub/rpc/messages,
   libp2p/protocols/pubsub/errors,
   nimcrypto/sha2,
   secp256k1

diff --git a/waku/factory/waku.nim b/waku/factory/waku.nim
@@ -4,7 +4,7 @@ else:
   {.push raises: [].}
 
 import
-  std/[options, strutils, sequtils],
+  std/[options, sequtils],
   stew/results,
   chronicles,
   chronos,
@@ -21,20 +21,10 @@ import
   ../../waku/common/logging,
   ../../waku/waku_core,
   ../../waku/waku_node,
-  ../../waku/node/waku_metrics,
   ../../waku/node/peer_manager,
   ../../waku/node/health_monitor,
   ../../waku/waku_api/message_cache,
-  ../../waku/waku_api/handlers,
   ../../waku/waku_api/rest/server,
-  ../../waku/waku_api/rest/debug/handlers as rest_debug_api,
-  ../../waku/waku_api/rest/relay/handlers as rest_relay_api,
-  ../../waku/waku_api/rest/filter/handlers as rest_filter_api,
-  ../../waku/waku_api/rest/lightpush/handlers as rest_lightpush_api,
-  ../../waku/waku_api/rest/store/handlers as rest_store_api,
-  ../../waku/waku_api/rest/legacy_store/handlers as rest_legacy_store_api,
-  ../../waku/waku_api/rest/health/handlers as rest_health_api,
-  ../../waku/waku_api/rest/admin/handlers as rest_admin_api,
   ../../waku/waku_archive,
   ../../waku/discovery/waku_dnsdisc,
   ../../waku/discovery/waku_discv5,

diff --git a/waku/node/config.nim b/waku/node/config.nim
@@ -4,9 +4,8 @@ else:
   {.push raises: [].}
 
 import
-  std/[options, sequtils, strutils],
+  std/[options, sequtils, strutils, net],
   stew/results,
-  stew/shims/net,
   libp2p/[multiaddress, multicodec]
 import ../../waku/waku_core/peers
 import ../waku_enr