Reverted 6ebe91b6: abandoning the async search design for now.

3 files changed, 4 insertions, 6 deletions

diff --git a/dht/src/Network/BitTorrent/MainlineDHT.hs b/dht/src/Network/BitTorrent/MainlineDHT.hs
index 0269268f..bb556bc6 100644
--- a/dht/src/Network/BitTorrent/MainlineDHT.hs
+++ b/dht/src/Network/BitTorrent/MainlineDHT.hs
@@ -1082,7 +1082,7 @@ mainlineSearch :: (NodeId -> NodeInfo -> IO (Maybe ([NodeInfo], [r], Maybe tok))
 mainlineSearch qry = Search
     { searchSpace       = mainlineSpace
     , searchNodeAddress = nodeIP &&& nodePort
-    , searchQuery       = Left qry
+    , searchQuery       = qry
     , searchAlpha       = 8
     , searchK           = 16
     }
diff --git a/dht/src/Network/Tox/DHT/Handlers.hs b/dht/src/Network/Tox/DHT/Handlers.hs
index 73bc2229..7806da78 100644
--- a/dht/src/Network/Tox/DHT/Handlers.hs
+++ b/dht/src/Network/Tox/DHT/Handlers.hs
@@ -198,7 +198,7 @@ newRouting addr crypto update4 update6 = do
             nullSearch = Search
                 { searchSpace       = toxSpace
                 , searchNodeAddress = nodeIP &&& nodePort
-                , searchQuery       = Left $ \_ _ -> return Nothing
+                , searchQuery       = \_ _ -> return Nothing
                 , searchAlpha       = 1
                 , searchK           = 2
                 }
@@ -541,9 +541,7 @@ nodeSearch :: Client -> TVar (HashMap NodeId [NodeInfoCallback]) -> Search NodeI
 nodeSearch client cbvar = Search
     { searchSpace       = toxSpace
     , searchNodeAddress = nodeIP &&& nodePort
-    -- searchQuery :: Either (nid -> ni -> IO (Maybe ([ni], [r], Maybe tok)))
-    --                       (nid -> ni -> (Maybe ([ni],[r],Maybe tok) -> IO ()) -> IO ())
-    , searchQuery       = Left $ getNodesUDP client cbvar
+    , searchQuery       = getNodesUDP client cbvar
     , searchAlpha       = 8
     , searchK           = 16
     }
diff --git a/dht/src/Network/Tox/Onion/Handlers.hs b/dht/src/Network/Tox/Onion/Handlers.hs
index 7951e707..65ec846c 100644
--- a/dht/src/Network/Tox/Onion/Handlers.hs
+++ b/dht/src/Network/Tox/Onion/Handlers.hs
@@ -222,7 +222,7 @@ toxidSearch :: (OnionDestination r -> STM (OnionDestination r, Int))
 toxidSearch getTimeout crypto client = Search
     { searchSpace       = toxSpace
     , searchNodeAddress = nodeIP &&& nodePort
-    , searchQuery       = Left $ getRendezvous getTimeout crypto client
+    , searchQuery       = getRendezvous getTimeout crypto client
     , searchAlpha = 3
     , searchK     = 6
     }