5 files changed, 5 insertions, 10 deletions

diff --git a/src/Network/BitTorrent/Exchange/Protocol.hs b/src/Network/BitTorrent/Exchange/Protocol.hs
index 3b2472da..8286ae7d 100644
--- a/src/Network/BitTorrent/Exchange/Protocol.hs
+++ b/src/Network/BitTorrent/Exchange/Protocol.hs
@@ -64,7 +64,6 @@ import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BC
 import qualified Data.ByteString.Lazy as Lazy
-import Data.Char
 import Data.Default
 import Data.List as L
 import Data.Word
diff --git a/src/Network/BitTorrent/Sessions/Types.lhs b/src/Network/BitTorrent/Sessions/Types.lhs
index e62e362f..3dde1853 100644
--- a/src/Network/BitTorrent/Sessions/Types.lhs
+++ b/src/Network/BitTorrent/Sessions/Types.lhs
@@ -19,7 +19,8 @@
 >
 >        , Progress (..)
 >        , left, uploaded, downloaded
->        , startProgress, enqueuedProgress
+>        , startProgress
+>        , enqueuedProgress, uploadedProgress, dequeuedProgress
 >
 >        , ClientSession (..)
 >
diff --git a/src/Network/BitTorrent/Tracker/HTTP.hs b/src/Network/BitTorrent/Tracker/HTTP.hs
index f781b847..4fef5e56 100644
--- a/src/Network/BitTorrent/Tracker/HTTP.hs
+++ b/src/Network/BitTorrent/Tracker/HTTP.hs
@@ -15,7 +15,7 @@
 --
 module Network.BitTorrent.Tracker.HTTP
        ( askTracker, leaveTracker
-       , scrapeURL
+       , scrapeURL, scrape, scrapeOne
        ) where
 
 import Control.Applicative
@@ -30,7 +30,7 @@ import Data.URLEncoded as URL
 import Network.URI
 import Network.HTTP
 
-import Data.Torrent.Metainfo
+import Data.Torrent.Metainfo hiding (announce)
 import Network.BitTorrent.Tracker.Protocol
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/Tracker/Protocol.hs b/src/Network/BitTorrent/Tracker/Protocol.hs
index c468656f..4e1262ed 100644
--- a/src/Network/BitTorrent/Tracker/Protocol.hs
+++ b/src/Network/BitTorrent/Tracker/Protocol.hs
@@ -261,7 +261,7 @@ instance Serialize AnnounceQuery where
 
     ev   <- getEvent
     ip   <- getWord32be
-    key  <- getWord32be -- TODO
+--    key  <- getWord32be -- TODO
     want <- getWord32be
 
     port <- get
diff --git a/tests/Main.hs b/tests/Main.hs
index a968c487..fb69565d 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -52,11 +52,6 @@ prop_properBEncode _ expected = actual == Right expected
   where
     actual = decoded $ Lazy.toStrict $ encoded expected
 
-prop_properJSON :: (FromJSON a, ToJSON a) => Eq a => T a -> a -> Bool
-prop_properJSON _ expected = actual == Just expected
-  where
-    actual = JSON.decode $ JSON.encode expected
-
 instance Arbitrary URI where
   arbitrary = pure $ fromJust
               $ parseURI "http://exsample.com:80/123365_asd"