Revised interface to addHandler:

  Pass only a parse-error handler, not bunch of unneeded methods.

3 files changed, 10 insertions, 7 deletions

diff --git a/src/Network/BitTorrent/MainlineDHT.hs b/src/Network/BitTorrent/MainlineDHT.hs
index c0413322..c9abf003 100644
--- a/src/Network/BitTorrent/MainlineDHT.hs
+++ b/src/Network/BitTorrent/MainlineDHT.hs
@@ -583,8 +583,11 @@ newClient swarms addr = do
         gen :: Word16 -> (TransactionId, Word16)
         gen cnt = (TransactionId $ S.encode cnt, cnt+1)
 
+        ignoreParseError :: String -> IO ()
+        ignoreParseError _ = return ()
+
         client = Client
-            { clientNet           = addHandler ignoreErrors (handleMessage client) net
+            { clientNet           = addHandler ignoreParseError (handleMessage client) net
             , clientDispatcher    = dispatch
             , clientErrorReporter = ignoreErrors -- printErrors stderr
             , clientPending       = map_var
diff --git a/src/Network/QueryResponse.hs b/src/Network/QueryResponse.hs
index 492b7bb4..f15a0855 100644
--- a/src/Network/QueryResponse.hs
+++ b/src/Network/QueryResponse.hs
@@ -135,18 +135,18 @@ partitionTransportM parse encodex tr = do
 --      * f add x --> Nothing, consume x
 --                --> Just id, leave x to a different handler
 --                --> Just g, apply g to x and leave that to a different handler
-addHandler :: ErrorReporter addr x meth tid err -> (addr -> x -> IO (Maybe (x -> x))) -> Transport err addr x -> Transport err addr x
-addHandler err f tr = tr
+addHandler :: (err -> IO ()) -> (addr -> x -> IO (Maybe (x -> x))) -> Transport err addr x -> Transport err addr x
+addHandler onParseError f tr = tr
     { awaitMessage = \kont -> fix $ \eat -> awaitMessage tr $ \m -> do
         case m of
             Just (Right (x, addr)) -> f addr x >>= maybe eat (kont . Just . Right . (, addr) . ($ x))
-            Just (Left  e        ) -> reportParseError err e >> kont (Just $ Left e)
+            Just (Left  e        ) -> onParseError e >> kont (Just $ Left e)
             Nothing                -> kont $ Nothing
     }
 
 -- | Modify a 'Transport' to invoke an action upon every received packet.
 onInbound :: (addr -> x -> IO ()) -> Transport err addr x -> Transport err addr x
-onInbound f tr = addHandler ignoreErrors (\addr x -> f addr x >> return (Just id)) tr
+onInbound f tr = addHandler (const $ return ()) (\addr x -> f addr x >> return (Just id)) tr
 
 -- * Using a query\/response client.
 
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 4cc762c4..79bd68ac 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -204,7 +204,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
         eprinter = printErrors stderr
         mkclient (tbl,var) handlers =
             let client = Client
-                    { clientNet           = addHandler eprinter (handleMessage client) $ modifynet client net
+                    { clientNet           = addHandler (reportParseError eprinter) (handleMessage client) $ modifynet client net
                     , clientDispatcher    = dispatch tbl var handlers client
                     , clientErrorReporter = eprinter { reportTimeout = reportTimeout ignoreErrors }
                     , clientPending       = var
@@ -314,7 +314,7 @@ newTox keydb addr = do
         { toxDHT = dhtclient
         , toxOnion = onionclient
         , toxToRoute = onInbound (updateRoster roster) dtacrypt
-        , toxCrypto = addHandler (error "printErrors stderr") (cryptoNetHandler sessionsState) cryptonet
+        , toxCrypto = addHandler (reportParseError $ printErrors stderr) (cryptoNetHandler sessionsState) cryptonet
         , toxCryptoKeys = crypto
         , toxRouting = routing
         , toxTokens = toks