Merge pull request #104 from codex-storage/update-to-nim-2-x

Update to nim 2 x

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        nim: [1.6.18]
+        nim: [2.0.14]
         os: [ubuntu-latest, macOS-latest, windows-latest]
     steps:
     - name: Checkout

.gitignore

@@ -13,3 +13,4 @@ NimBinaries
 .update.timestamp
 *.dSYM
 .vscode/*
+nimbledeps

codexdht.nimble

@@ -1,24 +1,25 @@
 # Package
 
-version       = "0.4.0"
+version       = "0.5.0"
 author        = "Status Research & Development GmbH"
 description   = "DHT based on Eth discv5 implementation"
 license       = "MIT"
 skipDirs      = @["tests"]
 
 # Dependencies
-requires "secp256k1#2acbbdcc0e63002a013fff49f015708522875832" # >= 0.5.2 & < 0.6.0
+requires "nim >= 2.0.14 & < 3.0.0"
-requires "protobuf_serialization" # >= 0.2.0 & < 0.3.0
+requires "secp256k1 >= 0.6.0 & < 0.7.0"
-requires "nimcrypto >= 0.5.4"
+requires "protobuf_serialization >= 0.3.0 & < 0.4.0"
-requires "bearssl == 0.2.5"
+requires "nimcrypto >= 0.6.2 & < 0.7.0"
+requires "bearssl >= 0.2.5 & < 0.3.0"
 requires "chronicles >= 0.10.2 & < 0.11.0"
 requires "chronos >= 4.0.3 & < 4.1.0"
-requires "libp2p == 1.5.0"
+requires "libp2p >= 1.5.0 & < 2.0.0"
-requires "metrics"
+requires "metrics >= 0.1.0 & < 0.2.0"
-requires "stew#head"
+requires "stew >= 0.2.0 & < 0.3.0"
-requires "stint"
+requires "stint >= 0.8.1 & < 0.9.0"
-requires "https://github.com/codex-storage/nim-datastore >= 0.1.1 & < 0.2.0"
+requires "https://github.com/codex-storage/nim-datastore >= 0.2.0 & < 0.3.0"
-requires "questionable"
+requires "questionable >= 0.10.15 & < 0.11.0"
 
 task testAll, "Run all test suites":
   exec "nimble install -d -y"

codexdht/private/eth/p2p/discoveryv5/encoding.nim

@@ -11,7 +11,7 @@
 ## https://github.com/ethereum/devp2p/blob/master/discv5/discv5-theory.md#sessions
 ##
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[hashes, net, options, sugar, tables],

codexdht/private/eth/p2p/discoveryv5/ip_vote.nim

@@ -15,7 +15,7 @@
 ## To select the right address, a majority count is done. This is done over a
 ## sort of moving window as votes expire after `IpVoteTimeout`.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[tables, options],

codexdht/private/eth/p2p/discoveryv5/lru.nim

@@ -1,6 +1,6 @@
 import std/[tables, lists, options]
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 export tables, lists, options
 

codexdht/private/eth/p2p/discoveryv5/messages.nim

@@ -10,7 +10,7 @@
 ## These messages get protobuf encoded, while in the spec they get RLP encoded.
 ##
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[hashes, net],

codexdht/private/eth/p2p/discoveryv5/messages_encoding.nim

@@ -14,6 +14,7 @@ import
   stew/endians2,
   libp2p/routing_record,
   libp2p/signed_envelope,
+  libp2p/protobuf/minprotobuf,
   "."/[messages, spr, node],
   ../../../../dht/providers_encoding
 

codexdht/private/eth/p2p/discoveryv5/node.nim

@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/hashes,
@@ -28,7 +28,7 @@ type
   NodeId* = UInt256
 
   Address* = object
-    ip*: ValidIpAddress
+    ip*: IpAddress
     port*: Port
 
   Stats* = object
@@ -69,7 +69,7 @@ func newNode*(
       id: ? pk.toNodeId(),
       pubkey: pk,
       record: record,
-      address: Address(ip: ValidIpAddress.init(ip), port: port).some)
+      address: Address(ip: ip, port: port).some)
 
   ok node
 
@@ -103,7 +103,7 @@ func newNode*(r: SignedPeerRecord): Result[Node, cstring] =
       record: r,
       address: none(Address)))
 
-proc update*(n: Node, pk: PrivateKey, ip: Option[ValidIpAddress],
+proc update*(n: Node, pk: PrivateKey, ip: Option[IpAddress],
     tcpPort, udpPort: Option[Port] = none[Port]()): Result[void, cstring] =
   ? n.record.update(pk, ip, tcpPort, udpPort)
 
@@ -154,7 +154,7 @@ func shortLog*(id: NodeId): string =
       result.add(sid[i])
 chronicles.formatIt(NodeId): shortLog(it)
 
-func hash*(ip: ValidIpAddress): Hash =
+func hash*(ip: IpAddress): Hash =
   case ip.family
   of IpAddressFamily.IPv6: hash(ip.address_v6)
   of IpAddressFamily.IPv4: hash(ip.address_v4)

codexdht/private/eth/p2p/discoveryv5/nodes_verification.nim

@@ -1,4 +1,4 @@
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[sets, options],

codexdht/private/eth/p2p/discoveryv5/protocol.nim

@@ -71,7 +71,7 @@
 ## more requests will be needed for a lookup (adding bandwidth and latency).
 ## This might be a concern for mobile devices.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[tables, sets, options, math, sequtils, algorithm, strutils],
@@ -241,7 +241,7 @@ proc randomNodes*(d: Protocol, maxAmount: int): seq[Node] =
   d.routingTable.randomNodes(maxAmount)
 
 proc randomNodes*(d: Protocol, maxAmount: int,
-    pred: proc(x: Node): bool {.gcsafe, noSideEffect.}): seq[Node] =
+    pred: proc(x: Node): bool {.gcsafe, noSideEffect, raises: [].}): seq[Node] =
   ## Get a `maxAmount` of random nodes from the local routing table with the
   ## `pred` predicate function applied as filter on the nodes selected.
   d.routingTable.randomNodes(maxAmount, pred)
@@ -963,7 +963,7 @@ proc revalidateNode*(d: Protocol, n: Node) {.async.} =
 
     # Get IP and port from pong message and add it to the ip votes
     trace "pong rx", n, myip = res.ip, myport = res.port
-    let a = Address(ip: ValidIpAddress.init(res.ip), port: Port(res.port))
+    let a = Address(ip: res.ip, port: Port(res.port))
     d.ipVote.insert(n.id, a)
 
 proc revalidateLoop(d: Protocol) {.async.} =
@@ -1076,7 +1076,7 @@ func init*(
 
 proc newProtocol*(
     privKey: PrivateKey,
-    enrIp: Option[ValidIpAddress],
+    enrIp: Option[IpAddress],
     enrTcpPort, enrUdpPort: Option[Port],
     localEnrFields: openArray[(string, seq[byte])] = [],
     bootstrapRecords: openArray[SignedPeerRecord] = [],

codexdht/private/eth/p2p/discoveryv5/providers/cache.nim

@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import std/sequtils
 

codexdht/private/eth/p2p/discoveryv5/providers/common.nim

@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import std/sequtils
 import std/strutils

codexdht/private/eth/p2p/discoveryv5/providers/maintenance.nim

@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import std/options
 import std/sequtils

codexdht/private/eth/p2p/discoveryv5/providers/manager.nim

@@ -19,7 +19,7 @@ import pkg/stew/byteutils
 import pkg/questionable
 import pkg/questionable/results
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import ./maintenance
 import ./cache

codexdht/private/eth/p2p/discoveryv5/routing_table.nim

@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/[algorithm, times, sequtils, bitops, sets, options, tables],
@@ -34,7 +34,7 @@ type
 
   IpLimits* = object
     limit*: uint
-    ips: Table[ValidIpAddress, uint]
+    ips: Table[IpAddress, uint]
 
 
   RoutingTable* = object
@@ -101,7 +101,7 @@ type
     ReplacementExisting
     NoAddress
 
-func inc*(ipLimits: var IpLimits, ip: ValidIpAddress): bool =
+func inc*(ipLimits: var IpLimits, ip: IpAddress): bool =
   let val = ipLimits.ips.getOrDefault(ip, 0)
   if val < ipLimits.limit:
     ipLimits.ips[ip] = val + 1
@@ -109,7 +109,7 @@ func inc*(ipLimits: var IpLimits, ip: ValidIpAddress): bool =
   else:
     false
 
-func dec*(ipLimits: var IpLimits, ip: ValidIpAddress) =
+func dec*(ipLimits: var IpLimits, ip: IpAddress) =
   let val = ipLimits.ips.getOrDefault(ip, 0)
   if val == 1:
     ipLimits.ips.del(ip)
@@ -555,7 +555,7 @@ proc nodeToRevalidate*(r: RoutingTable): Node =
       return b.nodes[^1]
 
 proc randomNodes*(r: RoutingTable, maxAmount: int,
-    pred: proc(x: Node): bool {.gcsafe, noSideEffect.} = nil): seq[Node] =
+    pred: proc(x: Node): bool {.gcsafe, noSideEffect, raises: [].} = nil): seq[Node] =
   ## Get a `maxAmount` of random nodes from the routing table with the `pred`
   ## predicate function applied as filter on the nodes selected.
   var maxAmount = maxAmount

codexdht/private/eth/p2p/discoveryv5/sessions.nim

@@ -16,7 +16,7 @@
 ## - the one derived in the key-exchange started by the other node.
 ## To alleviate this issue, we store two decryption keys in each session.
 
-{.push raises: [Defect].}
+{.push raises: [].}
 
 import
   std/options,
@@ -39,7 +39,7 @@ type
 
 func makeKey(id: NodeId, address: Address): SessionKey =
   var pos = 0
-  result[pos ..< pos+sizeof(id)] = toBytes(id)
+  result[pos ..< pos+sizeof(id)] = toBytesBE(id)
   pos.inc(sizeof(id))
   case address.ip.family
   of IpAddressFamily.IpV4:
@@ -47,7 +47,7 @@ func makeKey(id: NodeId, address: Address): SessionKey =
   of IpAddressFamily.IpV6:
     result[pos ..< pos+sizeof(address.ip.address_v6)] = address.ip.address_v6
   pos.inc(sizeof(address.ip.address_v6))
-  result[pos ..< pos+sizeof(address.port)] = toBytes(address.port.uint16)
+  result[pos ..< pos+sizeof(address.port)] = toBytesBE(address.port.uint16)
 
 func swapr*(s: var Sessions, id: NodeId, address: Address) =
   var value: array[3 * sizeof(AesKey), byte]

codexdht/private/eth/p2p/discoveryv5/spr.nim

@@ -58,7 +58,7 @@ proc incSeqNo*(
 proc update*(
   r: var SignedPeerRecord,
   pk: crypto.PrivateKey,
-  ip: Option[ValidIpAddress],
+  ip: Option[IpAddress],
   tcpPort, udpPort: Option[Port] = none[Port]()):
   RecordResult[void] =
   ## Update a `SignedPeerRecord` with given ip address, tcp port, udp port and optional
@@ -97,9 +97,8 @@ proc update*(
     if udpPort.isNone and tcpPort.isNone:
       return err "No existing address in SignedPeerRecord with no port provided"
 
-    let ipAddr = try: ValidIpAddress.init(ip.get)
+    let ipAddr = ip.get
-                 except ValueError as e:
+   
-                   return err ("Existing address contains invalid address: " & $e.msg).cstring
     if tcpPort.isSome:
       transProto = IpTransportProtocol.tcpProtocol
       transProtoPort = tcpPort.get
@@ -223,7 +222,7 @@ proc init*(
   T: type SignedPeerRecord,
   seqNum: uint64,
   pk: PrivateKey,
-  ip: Option[ValidIpAddress],
+  ip: Option[IpAddress],
   tcpPort, udpPort: Option[Port]):
   RecordResult[T] =
   ## Initialize a `SignedPeerRecord` with given sequence number, private key, optional
@@ -238,9 +237,7 @@ proc init*(
       tcpPort, udpPort
 
   var
-    ipAddr = try: ValidIpAddress.init("127.0.0.1")
+    ipAddr = static parseIpAddress("127.0.0.1")
-             except ValueError as e:
-               return err ("Existing address contains invalid address: " & $e.msg).cstring
     proto: IpTransportProtocol
     protoPort: Port
 

codexdht/private/eth/p2p/discoveryv5/transport.nim

@@ -259,7 +259,7 @@ proc processClient[T](transp: DatagramTransport, raddr: TransportAddress):
            except ValueError as e:
              error "Not a valid IpAddress", exception = e.name, msg = e.msg
              return
-  let a = Address(ip: ValidIpAddress.init(ip), port: raddr.port)
+  let a = Address(ip: ip, port: raddr.port)
 
   t.receive(a, buf)
 
@@ -292,7 +292,7 @@ proc newTransport*[T](
 
   Transport[T](
     client: client,
-    bindAddress: Address(ip: ValidIpAddress.init(bindIp), port: bindPort),
+    bindAddress: Address(ip: bindIp, port: bindPort),
     codec: Codec(
       localNode: localNode,
       privKey: privKey,

config.nims

@@ -1,2 +1,9 @@
 
 switch("define", "libp2p_pki_schemes=secp256k1")
+# begin Nimble config (version 2)
+when withDir(thisDir(), system.fileExists("nimble.paths")):
+  include "nimble.paths"
+# end Nimble config
+
+when (NimMajor, NimMinor) >= (2, 0):
+  --mm:refc

tests/dht/test_helper.nim

@@ -4,14 +4,10 @@ import
   libp2p/crypto/[crypto, secp],
   libp2p/multiaddress,
   codexdht/discv5/[node, routing_table, spr],
-  codexdht/discv5/crypto as dhtcrypto,
+  codexdht/discv5/protocol as discv5_protocol
-  codexdht/discv5/protocol as discv5_protocol,
-  stew/shims/net
-
-export net
 
 proc localAddress*(port: int): Address =
-  Address(ip: ValidIpAddress.init("127.0.0.1"), port: Port(port))
+  Address(ip: parseIpAddress("127.0.0.1"), port: Port(port))
 
 proc example*(T: type PrivateKey, rng: ref HmacDrbgContext): PrivateKey =
   PrivateKey.random(PKScheme.Secp256k1, rng[]).expect("Valid rng for private key")
@@ -54,7 +50,7 @@ proc nodeIdInNodes*(id: NodeId, nodes: openArray[Node]): bool =
     if id == n.id: return true
 
 proc generateNode*(privKey: PrivateKey, port: int,
-    ip: ValidIpAddress = ValidIpAddress.init("127.0.0.1")): Node =
+    ip: IpAddress = parseIpAddress("127.0.0.1")): Node =
 
   let
     port = Port(port)
@@ -72,7 +68,7 @@ proc generateNRandomNodes*(rng: ref HmacDrbgContext, n: int): seq[Node] =
   res
 
 proc nodeAndPrivKeyAtDistance*(n: Node, rng: var HmacDrbgContext, d: uint32,
-    ip: ValidIpAddress = ValidIpAddress.init("127.0.0.1")): (Node, PrivateKey) =
+    ip: IpAddress = parseIpAddress("127.0.0.1")): (Node, PrivateKey) =
   while true:
     let
       privKey = PrivateKey.random(rng).expect("Valid rng for private key")
@@ -81,23 +77,23 @@ proc nodeAndPrivKeyAtDistance*(n: Node, rng: var HmacDrbgContext, d: uint32,
       return (node, privKey)
 
 proc nodeAtDistance*(n: Node, rng: var HmacDrbgContext, d: uint32,
-    ip: ValidIpAddress = ValidIpAddress.init("127.0.0.1")): Node =
+    ip: IpAddress = parseIpAddress("127.0.0.1")): Node =
   let (node, _) = n.nodeAndPrivKeyAtDistance(rng, d, ip)
   node
 
 proc nodesAtDistance*(
     n: Node, rng: var HmacDrbgContext, d: uint32, amount: int,
-    ip: ValidIpAddress = ValidIpAddress.init("127.0.0.1")): seq[Node] =
+    ip: IpAddress = parseIpAddress("127.0.0.1")): seq[Node] =
   for i in 0..<amount:
     result.add(nodeAtDistance(n, rng, d, ip))
 
 proc nodesAtDistanceUniqueIp*(
     n: Node, rng: var HmacDrbgContext, d: uint32, amount: int,
-    ip: ValidIpAddress = ValidIpAddress.init("127.0.0.1")): seq[Node] =
+    ip: IpAddress = parseIpAddress("127.0.0.1")): seq[Node] =
   var ta = initTAddress(ip, Port(0))
   for i in 0..<amount:
     ta.inc()
-    result.add(nodeAtDistance(n, rng, d, ValidIpAddress.init(ta.address())))
+    result.add(nodeAtDistance(n, rng, d, ta.address()))
 
 proc addSeenNode*(d: discv5_protocol.Protocol, n: Node): bool =
   # Add it as a seen node, warning: for testing convenience only!

tests/dht/test_providermngr.nim

@@ -6,7 +6,6 @@ import pkg/asynctest/chronos/unittest
 import pkg/datastore
 from pkg/libp2p import PeerId
 
-import codexdht/dht
 import codexdht/private/eth/p2p/discoveryv5/spr
 import codexdht/private/eth/p2p/discoveryv5/providers
 import codexdht/discv5/node

tests/dht/test_providers.nim

@@ -10,18 +10,15 @@
 {.used.}
 
 import
-  std/[options, sequtils],
+  std/[options],
   asynctest/chronos/unittest2,
   bearssl/rand,
   chronicles,
   chronos,
-  nimcrypto,
   libp2p/crypto/[crypto, secp],
   libp2p/[multiaddress, multicodec, multihash, routing_record, signed_envelope],
-  codexdht/dht,
   codexdht/discv5/crypto as dhtcrypto,
   codexdht/discv5/protocol as discv5_protocol,
-  stew/byteutils,
   test_helper
 
 proc bootstrapNodes(

tests/discv5/test_discoveryv5.nim

@@ -2,7 +2,7 @@
 
 import
   std/tables,
-  chronos, chronicles, stint, asynctest/chronos/unittest, stew/shims/net,
+  chronos, chronicles, stint, asynctest/chronos/unittest, 
   stew/byteutils, bearssl/rand,
   libp2p/crypto/crypto,
   codexdht/discv5/[transport, spr, node, routing_table, encoding, sessions, nodes_verification],
@@ -287,7 +287,7 @@ suite "Discovery v5 Tests":
     await mainNode.closeWait()
     await testNode.closeWait()
 
-  proc testLookupTargets(fast: bool = false) {.async: (raises: [Exception]).} =
+  proc testLookupTargets(fast: bool = false): Future[bool] {.async.} =
     const
       nodeCount = 17
 
@@ -306,9 +306,9 @@ suite "Discovery v5 Tests":
       for t in nodes:
         if n != t:
           let pong = await n.ping(t.localNode)
-          check pong.isOk()
           if pong.isErr():
             echo pong.error
+            return false
           # check (await n.ping(t.localNode)).isOk()
 
     for i in 1 ..< nodeCount:
@@ -318,16 +318,19 @@ suite "Discovery v5 Tests":
       let target = nodes[i]
       let discovered = await nodes[nodeCount-1].lookup(target.localNode.id, fast = fast)
       debug "Lookup result", target = target.localNode, discovered
-      check discovered[0] == target.localNode
+      if discovered[0] != target.localNode:
+        return false
 
     for node in nodes:
       await node.closeWait()
 
+    return true
+
   test "Lookup targets":
-    await testLookupTargets()
+    check await testLookupTargets()
 
   test "Lookup targets using traditional findNode":
-    await testLookupTargets(fast = true)
+    check await testLookupTargets(fast = true)
 
   test "Resolve target":
     let
@@ -442,7 +445,7 @@ suite "Discovery v5 Tests":
   test "New protocol with spr":
     let
       privKey = PrivateKey.example(rng)
-      ip = some(ValidIpAddress.init("127.0.0.1"))
+      ip = some(parseIpAddress("127.0.0.1"))
       port = Port(20301)
       node = newProtocol(privKey, ip, some(port), some(port), bindPort = port,
         rng = rng)
@@ -537,7 +540,7 @@ suite "Discovery v5 Tests":
     let
       port = Port(9000)
       fromNoderecord = SignedPeerRecord.init(1, PrivateKey.example(rng),
-        some(ValidIpAddress.init("11.12.13.14")),
+        some(parseIpAddress("11.12.13.14")),
         some(port), some(port))[]
       fromNode = newNode(fromNoderecord)[]
       privKey = PrivateKey.example(rng)
@@ -549,7 +552,7 @@ suite "Discovery v5 Tests":
     block: # Duplicates
       let
         record = SignedPeerRecord.init(
-          1, privKey, some(ValidIpAddress.init("12.13.14.15")),
+          1, privKey, some(parseIpAddress("12.13.14.15")),
           some(port), some(port))[]
 
       # Exact duplicates
@@ -559,7 +562,7 @@ suite "Discovery v5 Tests":
 
       # Node id duplicates
       let recordSameId = SignedPeerRecord.init(
-        1, privKey, some(ValidIpAddress.init("212.13.14.15")),
+        1, privKey, some(parseIpAddress("212.13.14.15")),
         some(port), some(port))[]
       records.add(recordSameId)
       nodes = verifyNodesRecords(records, fromNode, limit, targetDistance)
@@ -568,7 +571,7 @@ suite "Discovery v5 Tests":
     block: # No address
       let
         recordNoAddress = SignedPeerRecord.init(
-          1, privKey, none(ValidIpAddress), some(port), some(port))[]
+          1, privKey, none(IpAddress), some(port), some(port))[]
         records = [recordNoAddress]
         test = verifyNodesRecords(records, fromNode, limit, targetDistance)
       check test.len == 0
@@ -576,7 +579,7 @@ suite "Discovery v5 Tests":
     block: # Invalid address - site local
       let
         recordInvalidAddress = SignedPeerRecord.init(
-          1, privKey, some(ValidIpAddress.init("10.1.2.3")),
+          1, privKey, some(parseIpAddress("10.1.2.3")),
           some(port), some(port))[]
         records = [recordInvalidAddress]
         test = verifyNodesRecords(records, fromNode, limit, targetDistance)
@@ -585,7 +588,7 @@ suite "Discovery v5 Tests":
     block: # Invalid address - loopback
       let
         recordInvalidAddress = SignedPeerRecord.init(
-          1, privKey, some(ValidIpAddress.init("127.0.0.1")),
+          1, privKey, some(parseIpAddress("127.0.0.1")),
           some(port), some(port))[]
         records = [recordInvalidAddress]
         test = verifyNodesRecords(records, fromNode, limit, targetDistance)
@@ -594,7 +597,7 @@ suite "Discovery v5 Tests":
     block: # Invalid distance
       let
         recordInvalidDistance = SignedPeerRecord.init(
-          1, privKey, some(ValidIpAddress.init("12.13.14.15")),
+          1, privKey, some(parseIpAddress("12.13.14.15")),
           some(port), some(port))[]
         records = [recordInvalidDistance]
         test = verifyNodesRecords(records, fromNode, limit, @[0'u16])
@@ -603,7 +606,7 @@ suite "Discovery v5 Tests":
     block: # Invalid distance but distance validation is disabled
       let
         recordInvalidDistance = SignedPeerRecord.init(
-          1, privKey, some(ValidIpAddress.init("12.13.14.15")),
+          1, privKey, some(parseIpAddress("12.13.14.15")),
           some(port), some(port))[]
         records = [recordInvalidDistance]
         test = verifyNodesRecords(records, fromNode, limit)
@@ -630,7 +633,7 @@ suite "Discovery v5 Tests":
       let
         privKey = PrivateKey.example(rng)
         enrRec = SignedPeerRecord.init(1, privKey,
-          some(ValidIpAddress.init("127.0.0.1")), some(Port(9000)),
+          some(parseIpAddress("127.0.0.1")), some(Port(9000)),
           some(Port(9000))).expect("Properly intialized private key")
         sendNode = newNode(enrRec).expect("Properly initialized record")
       var codec = Codec(localNode: sendNode, privKey: privKey, sessions: Sessions.init(5))
@@ -659,7 +662,7 @@ suite "Discovery v5 Tests":
     let
       privKey = PrivateKey.example(rng)
       enrRec = SignedPeerRecord.init(1, privKey,
-        some(ValidIpAddress.init("127.0.0.1")), some(Port(9000)),
+        some(parseIpAddress("127.0.0.1")), some(Port(9000)),
         some(Port(9000))).expect("Properly intialized private key")
       sendNode = newNode(enrRec).expect("Properly initialized record")
     var codec = Codec(localNode: sendNode, privKey: privKey, sessions: Sessions.init(5))
@@ -690,7 +693,7 @@ suite "Discovery v5 Tests":
       a = localAddress(20303)
       privKey = PrivateKey.example(rng)
       enrRec = SignedPeerRecord.init(1, privKey,
-        some(ValidIpAddress.init("127.0.0.1")), some(Port(9000)),
+        some(parseIpAddress("127.0.0.1")), some(Port(9000)),
         some(Port(9000))).expect("Properly intialized private key")
       sendNode = newNode(enrRec).expect("Properly initialized record")
     var codec = Codec(localNode: sendNode, privKey: privKey, sessions: Sessions.init(5))

tests/discv5/test_discoveryv5_encoding.nim

@@ -9,7 +9,6 @@ import
   codexdht/discv5/[messages, messages_encoding, encoding, spr, node, sessions],
   codexdht/discv5/crypto,
   stew/byteutils,
-  stew/shims/net,
   stint,
   ../dht/test_helper
 
@@ -275,11 +274,11 @@ suite "Discovery v5.1 Packet Encodings Test Vectors":
 
     let
       enrRecA = SignedPeerRecord.init(1, privKeyA,
-        some(ValidIpAddress.init("127.0.0.1")), some(Port(9001)),
+        some(parseIpAddress("127.0.0.1")), some(Port(9001)),
         some(Port(9001))).expect("Properly intialized private key")
 
       enrRecB = SignedPeerRecord.init(1, privKeyB,
-        some(ValidIpAddress.init("127.0.0.1")), some(Port(9001)),
+        some(parseIpAddress("127.0.0.1")), some(Port(9001)),
         some(Port(9001))).expect("Properly intialized private key")
 
     nodeA = newNode(enrRecA).expect("Properly initialized record")
@@ -508,11 +507,11 @@ suite "Discovery v5.1 Additional Encode/Decode":
 
     let
       enrRecA = SignedPeerRecord.init(1, privKeyA,
-        some(ValidIpAddress.init("127.0.0.1")), some(Port(9001)),
+        some(parseIpAddress("127.0.0.1")), some(Port(9001)),
         some(Port(9001))).expect("Properly intialized private key")
 
       enrRecB = SignedPeerRecord.init(1, privKeyB,
-        some(ValidIpAddress.init("127.0.0.1")), some(Port(9001)),
+        some(parseIpAddress("127.0.0.1")), some(Port(9001)),
         some(Port(9001))).expect("Properly intialized private key")
 
     nodeA = newNode(enrRecA).expect("Properly initialized record")