3 files changed, 11 insertions, 12 deletions

diff --git a/dht/src/Network/Tox/DHT/Handlers.hs b/dht/src/Network/Tox/DHT/Handlers.hs
index 1eec93b9..e97cab96 100644
--- a/dht/src/Network/Tox/DHT/Handlers.hs
+++ b/dht/src/Network/Tox/DHT/Handlers.hs
@@ -330,7 +330,7 @@ serializer :: PacketKind
                 -> (Message -> Maybe (Asymm (Nonce8,pong)))
                 -> MethodSerializer TransactionId NodeInfo Message PacketKind ping (Maybe pong)
 serializer pktkind mkping mkpong = MethodSerializer
-        { methodTimeout  = \tid addr -> return (addr, 5000000)
+        { methodTimeout  = \addr -> return (addr, 5000000)
         , method         = pktkind
         -- wrapQuery :: tid -> addr -> addr -> qry -> x
         , wrapQuery      = \tid src dst ping -> mkping $ wrapAsymm tid src dst (, ping)
@@ -376,7 +376,7 @@ cookieRequest crypto client localUserKey addr = do
         nid = id2key $ nodeId addr
         cookieSerializer
             = MethodSerializer
-                   { methodTimeout  = \tid addr -> return (addr, 5000000)
+                   { methodTimeout  = \addr -> return (addr, 5000000)
                    , method    = CookieRequestType
                    , wrapQuery = \tid src dst cr -> DHTCookieRequest $ wrapAsymm tid src dst (, cr)
                    , unwrapResponse = fmap snd . unCookie
diff --git a/dht/src/Network/Tox/Onion/Handlers.hs b/dht/src/Network/Tox/Onion/Handlers.hs
index 25713aa1..3ea7395f 100644
--- a/dht/src/Network/Tox/Onion/Handlers.hs
+++ b/dht/src/Network/Tox/Onion/Handlers.hs
@@ -212,7 +212,7 @@ handlers net routing toks keydb AnnounceType
 handlers net _ _ keydb _ = Just $ NoReply Right $ dataToRouteH keydb net
 
 
-toxidSearch :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
+toxidSearch :: (OnionDestination r -> STM (OnionDestination r, Int))
                -> TransportCrypto
                -> Client r
                -> Search NodeId (IP, PortNumber) Nonce32 NodeInfo Rendezvous
@@ -224,7 +224,7 @@ toxidSearch getTimeout crypto client = Search
     , searchK     = 6
     }
 
-announceSerializer :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
+announceSerializer :: (OnionDestination r -> STM (OnionDestination r, Int))
                    -> MethodSerializer
                         TransactionId
                         (OnionDestination r)
@@ -276,7 +276,7 @@ unwrapAnnounceResponse alias ni (AnnounceResponse is_stored (SendNodes ns))
 -- started.
 
 
-sendOnion :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
+sendOnion :: (OnionDestination r -> STM (OnionDestination r, Int))
             -> Client r
             -> AnnounceRequest
             -> OnionDestination r
@@ -291,8 +291,7 @@ sendOnion getTimeout client req oaddr unwrap =
           (return . Just . unwrap (onionNodeInfo oaddr))
           $ join mb
 
-asyncOnion :: (TransactionId
-                     -> OnionDestination r -> STM (OnionDestination r, Int))
+asyncOnion :: (OnionDestination r -> STM (OnionDestination r, Int))
                     -> QR.Client
                          err
                          PacketKind
@@ -316,7 +315,7 @@ asyncOnion getTimeout client req oaddr unwrap go =
 
 
 -- | Lookup the secret counterpart for a given alias key.
-getRendezvous :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
+getRendezvous :: (OnionDestination r -> STM (OnionDestination r, Int))
             -> TransportCrypto
             -> Client r
             -> NodeId
@@ -334,7 +333,7 @@ getRendezvous getTimeout crypto client nid ni = do
         (unwrapAnnounceResponse rkey)
 
 asyncGetRendezvous
-    :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
+    :: (OnionDestination r -> STM (OnionDestination r, Int))
        -> TransportCrypto
        -> Client r
        -> NodeId
@@ -353,7 +352,7 @@ asyncGetRendezvous getTimeout crypto client nid ni go = do
         (unwrapAnnounceResponse rkey)
         go
 
-putRendezvous :: (TransactionId -> OnionDestination r -> STM (OnionDestination r, Int))
+putRendezvous :: (OnionDestination r -> STM (OnionDestination r, Int))
                -> TransportCrypto
                -> Client r
                -> PublicKey
diff --git a/dht/src/Network/Tox/TCP.hs b/dht/src/Network/Tox/TCP.hs
index d0d67f25..e80a22d1 100644
--- a/dht/src/Network/Tox/TCP.hs
+++ b/dht/src/Network/Tox/TCP.hs
@@ -229,7 +229,7 @@ getUDPNodes' tcp seeking dst0 = do
                         AnnounceRequest
                         (Either String AnnounceResponse)
             meth = MethodSerializer
-                    { methodTimeout = \tid addr -> return (addr,12000000) -- 12 second timeout
+                    { methodTimeout = \addr -> return (addr,12000000) -- 12 second timeout
                     , method = OnionPacketID -- meth
                     , wrapQuery = \n8 src gateway x -> (,) True $
                         OnionPacket n24 $ Addressed (UDP.nodeAddr dst)
@@ -269,7 +269,7 @@ tcpPing client dst = do
  where meth = MethodSerializer
                 { wrapQuery      = \n8 src dst () -> (True,RelayPing n8)
                 , unwrapResponse = \_ -> ()
-                , methodTimeout  = \n8 dst -> return (dst,5000000)
+                , methodTimeout  = \dst -> return (dst,5000000)
                 , method         = PingPacket
                 }