5 files changed, 13 insertions, 7 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 600b2587..71f82589 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -232,6 +232,7 @@ test-suite spec
 
                        -- * Data
                      , bytestring
+                     , bytestring-arbitrary
                      , containers
                      , convertible
                      , data-default
diff --git a/tests/Config.hs b/tests/Config.hs
index 9ffb0d8c..55e30867 100644
--- a/tests/Config.hs
+++ b/tests/Config.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP             #-}
 {-# LANGUAGE RecordWildCards #-}
 module Config
        ( -- * Types
@@ -39,8 +40,10 @@ import Network.BitTorrent.Address (IP, PeerAddr (PeerAddr), genPeerId)
 type ClientName = String
 
 
+#if !MIN_VERSION_network(2,6,3)
 instance Read PortNumber where
   readsPrec = error "readsPrec"
+#endif
 
 data ClientOpts = ClientOpts
   { peerPort   :: PortNumber  -- tcp port
@@ -64,13 +67,13 @@ defThisOpts = def
 
 clientOptsParser :: Parser ClientOpts
 clientOptsParser = ClientOpts
-  <$> option
+  <$> option auto
     ( long    "peer-port"  <> short 'p'
    <> value   6881         <> showDefault
    <> metavar "NUM"
    <> help    "port to bind the specified bittorrent client"
     )
-  <*> option
+  <*> option auto
     ( long    "node-port"  <> short 'n'
    <> value   6881         <> showDefault
    <> metavar "NUM"
@@ -177,4 +180,4 @@ getOpts = do
         exitFailure
 
       writeIORef envOptsRef envOpts
-      return (envOpts, hspecOpts)
\ No newline at end of file
+      return (envOpts, hspecOpts)
diff --git a/tests/Network/BitTorrent/DHT/RoutingSpec.hs b/tests/Network/BitTorrent/DHT/RoutingSpec.hs
index aeccff5f..3077a52a 100644
--- a/tests/Network/BitTorrent/DHT/RoutingSpec.hs
+++ b/tests/Network/BitTorrent/DHT/RoutingSpec.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE FlexibleContexts    #-}
 module Network.BitTorrent.DHT.RoutingSpec (spec) where
 import Control.Applicative
 import Control.Monad.State
@@ -73,4 +74,4 @@ spec = do
       let t1 = runSimulation e (T.insert n t)
       let t2 = runSimulation e (T.insert n t >>= T.insert n)
       t1 `shouldBe` t2
--}
\ No newline at end of file
+-}
diff --git a/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs b/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
index 234965fa..1ba772f6 100644
--- a/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
@@ -1,13 +1,14 @@
 {-# OPTIONS -fno-warn-orphans #-}
 module Network.BitTorrent.Exchange.BitfieldSpec (spec) where
 import Control.Applicative
+import Data.ByteString.Arbitrary
 import Test.Hspec
 import Test.QuickCheck
 
 import Network.BitTorrent.Exchange.Bitfield
 
 instance Arbitrary Bitfield where
-  arbitrary = fromBitmap <$> arbitrary
+  arbitrary = fromBitmap . fromABS <$> arbitrary
 
 spec :: Spec
-spec = return ()
\ No newline at end of file
+spec = return ()
diff --git a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs b/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
index 3a3dddf5..73acb3fa 100644
--- a/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPC/UDPSpec.hs
@@ -18,7 +18,7 @@ import Network.BitTorrent.Tracker.RPC.UDP
 
 
 validateInfo :: AnnounceQuery -> AnnounceInfo -> Expectation
-validateInfo _ Message.Failure {..} = error "validateInfo: failure"
+validateInfo _ Message.Failure {} = error "validateInfo: failure"
 validateInfo AnnounceQuery {..}  AnnounceInfo {..} = do
     respComplete    `shouldSatisfy` isJust
     respIncomplete  `shouldSatisfy` isJust