From 8d8f19c6ada23f4337d4bf8f65d30b02b6a7eecc Mon Sep 17 00:00:00 2001
From: Arnaud <arnaud@status.im>
Date: Mon, 25 May 2026 11:33:04 +0400
Subject: [PATCH] Cleanup

---
 storage/discovery.nim               | 8 --------
 tests/storage/testdiscovery.nim     | 9 ---------
 tests/storage/testnatsimulation.nim | 8 ++++----
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/storage/discovery.nim b/storage/discovery.nim
index 66da8c32..4c9a5ef2 100644
--- a/storage/discovery.nim
+++ b/storage/discovery.nim
@@ -213,14 +213,6 @@ proc updateAnnounceRecord*(d: Discovery, addrs: openArray[MultiAddress]) =
     .init(d.key, PeerRecord.init(d.peerId, d.announceAddrs))
     .expect("Should construct signed record").some
 
-proc updateDhtRecord*(
-    d: Discovery, addrs: openArray[MultiAddress]
-) {.deprecated: "use updateRecordsAndSpr instead".} =
-  info "Updating Dht record", addrs = addrs
-  d.dhtRecord = SignedPeerRecord
-    .init(d.key, PeerRecord.init(d.peerId, @addrs))
-    .expect("Should construct signed record").some
-
 proc start*(d: Discovery) {.async: (raises: []).} =
   try:
     d.protocol.open()
diff --git a/tests/storage/testdiscovery.nim b/tests/storage/testdiscovery.nim
index 965959d4..863f40a6 100644
--- a/tests/storage/testdiscovery.nim
+++ b/tests/storage/testdiscovery.nim
@@ -39,12 +39,3 @@ suite "Discovery - SPR record logic":
     disc.updateAnnounceRecord(@[relayAddr])
 
     check disc.getSpr() == sprBefore
-
-  test "updateDhtRecord deprecated does not update the SPR":
-    disc.updateRecordsAndSpr(@[directAddr], udpPort)
-    let sprBefore = disc.getSpr()
-
-    let otherUdpAddr = MultiAddress.init("/ip4/9.9.9.9/udp/9999").expect("valid")
-    disc.updateDhtRecord(@[otherUdpAddr])
-
-    check disc.getSpr() == sprBefore
diff --git a/tests/storage/testnatsimulation.nim b/tests/storage/testnatsimulation.nim
index 81c51d4b..0bd630f0 100644
--- a/tests/storage/testnatsimulation.nim
+++ b/tests/storage/testnatsimulation.nim
@@ -55,7 +55,7 @@ asyncchecksuite "NatTransport - Address-Dependent Filtering":
   var bootstrap, thirdNode, natNode: Switch
 
   setup:
-    let router = NatRouter.new(AddressDependent, dropTimeout = 1.seconds)
+    let router = NatRouter.new(AddressDependent)
     bootstrap = newSwitch(Rng.instance())
     thirdNode = newSwitch(Rng.instance())
     natNode = newNatSwitch(router, Rng.instance())
@@ -88,7 +88,7 @@ asyncchecksuite "NatTransport - Address-and-Port-Dependent Filtering":
   var bootstrap, thirdNode, natNode: Switch
 
   setup:
-    let router = NatRouter.new(AddressAndPortDependent, dropTimeout = 1.seconds)
+    let router = NatRouter.new(AddressAndPortDependent)
     bootstrap = newSwitch(Rng.instance())
     thirdNode = newSwitch(Rng.instance())
     natNode = newNatSwitch(router, Rng.instance())
@@ -122,7 +122,7 @@ asyncchecksuite "NatTransport - Double NAT":
   var router: NatRouter
 
   setup:
-    router = NatRouter.new(DoubleNat, dropTimeout = 1.seconds)
+    router = NatRouter.new(DoubleNat)
     bootstrap = newSwitch(Rng.instance())
     natNode = newNatSwitch(router, Rng.instance())
     await bootstrap.start()
@@ -146,7 +146,7 @@ asyncchecksuite "NatTransport - Port Mapping":
   var router: NatRouter
 
   setup:
-    router = NatRouter.new(AddressAndPortDependent, dropTimeout = 1.seconds)
+    router = NatRouter.new(AddressAndPortDependent)
     bootstrap = newSwitch(Rng.instance())
     natNode = newNatSwitch(router, Rng.instance())
     await bootstrap.start()