6 files changed, 9 insertions, 17 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index daef3408..f970a83b 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -117,8 +117,8 @@ library
                      , stm           >= 2.4
 
                        -- Streaming
-                     , conduit          >= 1.0
-                     , network-conduit  >= 1.0
+                     , conduit          >= 1.1
+                     , conduit-extra    >= 1.1
                      , cereal-conduit   >= 0.5
 
                        -- * Logging
@@ -230,6 +230,7 @@ test-suite spec
                      , mtl
                      , resourcet
                      , conduit
+                     , conduit-extra
                      , monad-loops
                      , monad-logger
 
diff --git a/src/Network/BitTorrent/Client/Types.hs b/src/Network/BitTorrent/Client/Types.hs
index a5bf0cce..9bae7dc3 100644
--- a/src/Network/BitTorrent/Client/Types.hs
+++ b/src/Network/BitTorrent/Client/Types.hs
@@ -100,7 +100,7 @@ externalAddr Client {..} = PeerAddr
 newtype BitTorrent a = BitTorrent
   { unBitTorrent :: ReaderT Client IO a
   } deriving ( Functor, Applicative, Monad
-             , MonadIO, MonadThrow, MonadUnsafeIO, MonadBase IO
+             , MonadIO, MonadThrow, MonadBase IO
              )
 
 class MonadBitTorrent m where
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index 0dd4b862..eab25ebb 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -75,6 +75,7 @@ import Control.Monad.Logger
 import Control.Monad.Reader
 import Control.Monad.Trans.Control
 import Control.Monad.Trans.Resource
+import Data.Conduit.Lazy
 import Data.Default
 import Data.Fixed
 import Data.Hashable
@@ -256,7 +257,7 @@ newtype DHT ip a = DHT { unDHT :: ReaderT (Node ip) IO a }
   deriving ( Functor, Applicative, Monad
            , MonadIO, MonadBase IO
            , MonadReader (Node ip)
-           , MonadThrow, MonadUnsafeIO
+           , MonadThrow
            )
 
 instance MonadBaseControl IO (DHT ip) where
diff --git a/src/Network/BitTorrent/Exchange/Connection.hs b/src/Network/BitTorrent/Exchange/Connection.hs
index f208fa54..2d5f39bf 100644
--- a/src/Network/BitTorrent/Exchange/Connection.hs
+++ b/src/Network/BitTorrent/Exchange/Connection.hs
@@ -112,6 +112,7 @@ import Control.Concurrent hiding (yield)
 import Control.Exception
 import Control.Monad.Reader
 import Control.Monad.State
+import Control.Monad.Trans.Resource
 import Control.Lens
 import Data.ByteString as BS
 import Data.ByteString.Lazy as BSL
diff --git a/tests/Network/BitTorrent/DHT/SessionSpec.hs b/tests/Network/BitTorrent/DHT/SessionSpec.hs
index 522bd8df..a5376c32 100644
--- a/tests/Network/BitTorrent/DHT/SessionSpec.hs
+++ b/tests/Network/BitTorrent/DHT/SessionSpec.hs
@@ -5,6 +5,7 @@ import Control.Concurrent
 import Control.Exception
 import Control.Monad.Reader
 import Control.Monad.Trans.Resource
+import Data.Conduit.Lazy
 import Data.Default
 import Data.List as L
 import Test.Hspec
diff --git a/tests/Network/BitTorrent/Exchange/DownloadSpec.hs b/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
index a0d40af3..d46f2034 100644
--- a/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
@@ -33,19 +33,7 @@ withUpdates m = do
   undefined
 
 simulateFetch :: InfoDict -> Updates s (Maybe InfoDict)
-simulateFetch dict = go
-  where
-    blocks = chunkBy metadataPieceSize (BL.toStrict (BE.encode dict))
-    packPiece ix = Torrent.Piece ix (blocks !! ix)
-    ih     = idInfoHash dict
-
-    go = do
-      mix <- scheduleBlock undefined undefined
-      case mix of
-        Nothing -> return Nothing
-        Just ix -> do
-          mdict <- pushBlock undefined (packPiece ix)
-          maybe go (return . Just) mdict
+simulateFetch dict = undefined
 
 spec :: Spec
 spec = do