Cleanup

tests/integration/storageclient.nim

@@ -262,15 +262,6 @@ proc hasBlockRaw*(
   let url = client.baseurl & "/data/" & cid & "/exists"
   return client.get(url)
 
-proc connectPeer*(
-    client: StorageClient, peerId: string, addrs: seq[string]
-): Future[void] {.async: (raises: [CancelledError, HttpError]).} =
-  var url = client.baseurl & "/connect/" & peerId
-  if addrs.len > 0:
-    url &= "?" & addrs.mapIt("addrs=" & it).join("&")
-  let response = await client.get(url)
-  assert response.status == 200
-
 proc natRelayRunning*(
     client: StorageClient
 ): Future[?!bool] {.async: (raises: [CancelledError, HttpError]).} =

tests/storage/helpers/nodeutils.nim

@@ -227,8 +227,7 @@ proc generateNodes*(
           blockDiscovery.updateRecordsAndSpr(
             switch.peerInfo.addrs, udpPort = bindPort.Port
           )
-          if blockDiscovery.getSpr().isSome:
-            bootstrapNodes.add !blockDiscovery.getSpr()
+          bootstrapNodes.add blockDiscovery.getSpr()
 
         fullNode
       else:

tests/storage/testdiscovery.nim

@@ -1,4 +1,4 @@
-import std/[net, options, sequtils]
+import std/[net, sequtils]
 import pkg/libp2p/[multiaddress, routing_record]
 
 import ../asynctest
@@ -27,8 +27,7 @@ suite "Discovery - SPR record logic":
     disc.updateRecordsAndSpr(@[directAddr], udpPort)
 
     let spr = disc.getSpr()
-    check spr.isSome
-    let addrs = spr.get.data.addresses.mapIt($it.address)
+    let addrs = spr.data.addresses.mapIt($it.address)
     check addrs.anyIt(it.contains("/tcp/"))
     check addrs.anyIt(it.contains("/udp/"))
 

tests/storage/testnat.nim

@@ -112,7 +112,7 @@ asyncchecksuite "NAT - handleNatStatus":
 asyncchecksuite "NAT - Hole punching":
   test "setupHolePunching mounts the dcutr protocol on the switch":
     let sw = newStandardSwitch()
-    setupHolePunching(sw)
+    discard setupHolePunching(sw)
     check sw.ms.handlers.anyIt(dcutrCore.DcutrCodec in it.protos)
 
   test "holePunchIfRelayed returns early when the peer has no connections":