From b810f2dab0040e9c5a9f2344ecda67e5817893f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Sun, 1 Jun 2025 17:39:58 +0200 Subject: Discovery search using global state to ask new peers --- main/Main.hs | 9 ++------- main/Test.hs | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'main') diff --git a/main/Main.hs b/main/Main.hs index e9c0ae4..26f4b12 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -923,16 +923,11 @@ cmdDiscoveryInit = void $ do cmdDiscovery :: Command cmdDiscovery = void $ do - Just peer <- gets csIcePeer + server <- asks ciServer sref <- asks ciLine - eprint <- asks ciPrint case readRefDigest (BC.pack sref) of Nothing -> throwOtherError "failed to parse ref" - Just dgst -> liftIO $ do - res <- runExceptT $ sendToPeer peer $ DiscoverySearch $ Right dgst - case res of - Right _ -> return () - Left err -> eprint err + Just dgst -> discoverySearch server dgst #ifdef ENABLE_ICE_SUPPORT diff --git a/main/Test.hs b/main/Test.hs index a119b0f..c563291 100644 --- a/main/Test.hs +++ b/main/Test.hs @@ -959,8 +959,5 @@ cmdDiscoveryConnect :: Command cmdDiscoveryConnect = do [ tref ] <- asks tiParams Just dgst <- return $ readRefDigest $ encodeUtf8 tref - Just RunningServer {..} <- gets tsServer - peers <- liftIO $ getCurrentPeerList rsServer - forM_ peers $ \peer -> do - sendToPeer peer $ DiscoverySearch $ Right dgst + discoverySearch rsServer dgst -- cgit v1.2.3