From 6275e7ee5e5e83c3d03ea613b4ad7eea2511c879 Mon Sep 17 00:00:00 2001
From: Alain Brenzikofer <alain@encointer.org>
Date: Wed, 23 Sep 2026 11:50:37 +0200
Subject: [PATCH] iterate /goal

---
 src/Simplex/Messaging/Agent.hs       | 10 +++++-----
 tests/AgentTests/ResolveNameTests.hs |  5 +----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Simplex/Messaging/Agent.hs b/src/Simplex/Messaging/Agent.hs
index e886b8fe5..c6d68e20e 100644
--- a/src/Simplex/Messaging/Agent.hs
+++ b/src/Simplex/Messaging/Agent.hs
@@ -1278,6 +1278,11 @@ getConnShortLink' c nm userId = \case
 deleteLocalInvShortLink' :: AgentClient -> ConnShortLink 'CMInvitation -> AM ()
 deleteLocalInvShortLink' c (CSLInvitation _ srv linkId _) = withStore' c $ \db -> deleteInvShortLink db srv linkId
 
+resolveSimplexName' :: AgentClient -> NetworkRequestMode -> UserId -> SimplexDomain -> AM NameResponse
+resolveSimplexName' c nm userId domain = do
+  resolverSrv <- getNextNameServer c userId []
+  resolveName c nm userId resolverSrv domain
+
 ownedSimplexNames' :: AgentClient -> NetworkRequestMode -> UserId -> [SMPServer] -> Address -> Word32 -> AM (SMPServer, OwnedNames)
 ownedSimplexNames' c nm userId used addr offset = tryRelays ownedNamesRelays used
   where
@@ -1294,11 +1299,6 @@ ownedSimplexNames' c nm userId used addr offset = tryRelays ownedNamesRelays use
 ownedNamesRelays :: Int
 ownedNamesRelays = 3
 
-resolveSimplexName' :: AgentClient -> NetworkRequestMode -> UserId -> SimplexDomain -> AM NameResponse
-resolveSimplexName' c nm userId domain = do
-  resolverSrv <- getNextNameServer c userId []
-  resolveName c nm userId resolverSrv domain
-
 changeConnectionUser' :: AgentClient -> UserId -> ConnId -> UserId -> AM ()
 changeConnectionUser' c oldUserId connId newUserId = do
   SomeConn _ conn <- withStore c (`getConn` connId)
diff --git a/tests/AgentTests/ResolveNameTests.hs b/tests/AgentTests/ResolveNameTests.hs
index 82b4e6f5a..0a17eae55 100644
--- a/tests/AgentTests/ResolveNameTests.hs
+++ b/tests/AgentTests/ResolveNameTests.hs
@@ -48,10 +48,7 @@ oneSrv :: ServerCfg 'SMP.PSMP -> InitialAgentServers
 oneSrv cfg_ = (initAgentServersProxy_ SPMNever SPFProhibit) {smp = [(1, [cfg_])]}
 
 withDirectResolver :: (Status, LB.ByteString) -> (AgentClient -> IO a) -> IO a
-withDirectResolver (st, body) k =
-  NRS.withResolverServer (NRS.resolveResp st body) $ \port _ ->
-    withSmpServerConfigOn (transport @TLS) (withNames port memCfg) testPort $ \_ ->
-      withAgent 1 agentCfg (oneSrv (nameSrvCfg testSMPServer)) testDB k
+withDirectResolver resp k = withDirectResolverReqs resp $ \c _ -> k c
 
 -- | As 'withDirectResolver', with the requests the resolver was asked for.
 withDirectResolverReqs :: (Status, LB.ByteString) -> (AgentClient -> IORef [[Text]] -> IO a) -> IO a