Merge pull request #8 from Fuuzetsu/7.8.3-fixes

7.8.3 fixes

2 files changed, 2 insertions, 6 deletions

diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index d4710ecf..f7657490 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -127,17 +127,13 @@ findNodeQ key NodeInfo {..} = do
   NodeFound closest <- FindNode (toNodeId key) <@> nodeAddr
   return $ Right closest
 
-isLeft :: Either a b -> Bool
-isLeft (Right _) = False
-isLeft (Left  _) = True
-
 getPeersQ :: Address ip => InfoHash -> Iteration ip PeerAddr
 getPeersQ topic NodeInfo {..} = do
   GotPeers {..} <- GetPeers topic <@> nodeAddr
   let dist = distance (toNodeId topic) nodeId
   $(logInfoS) "getPeersQ" $ T.pack
          $ "distance: " <> render (pretty dist) <> " , result: "
-        <> if isLeft peers then "NODES" else "PEERS"
+        <> case peers of { Left _ -> "NODES"; Right _ -> "PEERS" }
   return peers
 
 announceQ :: Address ip => InfoHash -> PortNumber -> Iteration ip NodeAddr
diff --git a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
index 6e55eb04..de3fc5f5 100644
--- a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
+++ b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
@@ -37,7 +37,7 @@ import Data.ByteString.Lazy  as BL
 import Data.Default
 import Data.List as L
 import Data.Monoid
-import Data.Typeable
+import Data.Typeable hiding (Proxy)
 import Network.URI
 import           Network.HTTP.Conduit hiding
                  (Manager, newManager, closeManager, withManager)