5 files changed, 28 insertions, 28 deletions

diff --git a/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs b/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
new file mode 100644
index 00000000..234965fa
--- /dev/null
+++ b/tests/Network/BitTorrent/Exchange/BitfieldSpec.hs
@@ -0,0 +1,13 @@
+{-# OPTIONS -fno-warn-orphans #-}
+module Network.BitTorrent.Exchange.BitfieldSpec (spec) where
+import Control.Applicative
+import Test.Hspec
+import Test.QuickCheck
+
+import Network.BitTorrent.Exchange.Bitfield
+
+instance Arbitrary Bitfield where
+  arbitrary = fromBitmap <$> arbitrary
+
+spec :: Spec
+spec = return ()
\ No newline at end of file
diff --git a/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs b/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
index c21f55ef..d654cda1 100644
--- a/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
@@ -8,8 +8,7 @@ import Test.Hspec
 import Test.QuickCheck
 
 import Data.Torrent
-import Data.Torrent.InfoHash
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.Exchange.Connection
 import Network.BitTorrent.Exchange.Message
 
diff --git a/tests/Network/BitTorrent/Exchange/Session/MetadataSpec.hs b/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
index 975ceb5b..d46f2034 100644
--- a/tests/Network/BitTorrent/Exchange/Session/MetadataSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/DownloadSpec.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE RecordWildCards #-}
-module Network.BitTorrent.Exchange.Session.MetadataSpec (spec) where
+module Network.BitTorrent.Exchange.DownloadSpec (spec) where
 import Control.Concurrent
 import Data.ByteString as BS
 import Data.ByteString.Lazy as BL
@@ -7,11 +7,10 @@ import Test.Hspec
 import Test.QuickCheck
 
 import Data.BEncode as BE
-import Data.Torrent
-import Data.Torrent.Piece as P
-import Network.BitTorrent.Core
+import Data.Torrent as Torrent
+import Network.BitTorrent.Address
+import Network.BitTorrent.Exchange.Download
 import Network.BitTorrent.Exchange.Message
-import Network.BitTorrent.Exchange.Session.Metadata
 
 import Config
 import Network.BitTorrent.CoreSpec ()
@@ -25,27 +24,16 @@ chunkBy s bs
   | BS.null bs = []
   | otherwise  = BS.take s bs : chunkBy s (BS.drop s bs)
 
-withUpdates :: Updates a -> IO a
+withUpdates :: Updates s a -> IO a
 withUpdates m = do
   Torrent {..} <- getTestTorrent
   let infoDictLen = fromIntegral $ BL.length $ BE.encode tInfoDict
-  mvar <- newMVar (nullStatus infoDictLen)
-  runUpdates mvar placeholderAddr m
+  --mvar <- newMVar (nullStatus infoDictLen)
+  --runUpdates mvar placeholderAddr m
+  undefined
 
-simulateFetch :: InfoDict -> Updates (Maybe InfoDict)
-simulateFetch dict = go
-  where
-    blocks = chunkBy metadataPieceSize (BL.toStrict (BE.encode dict))
-    packPiece ix = P.Piece ix (blocks !! ix)
-    ih     = idInfoHash dict
-
-    go = do
-      mix <- scheduleBlock
-      case mix of
-        Nothing -> return Nothing
-        Just ix -> do
-          mdict <- pushBlock (packPiece ix) ih
-          maybe go (return . Just) mdict
+simulateFetch :: InfoDict -> Updates s (Maybe InfoDict)
+simulateFetch dict = undefined
 
 spec :: Spec
 spec = do
diff --git a/tests/Network/BitTorrent/Exchange/MessageSpec.hs b/tests/Network/BitTorrent/Exchange/MessageSpec.hs
index 63d814ff..d615b1ff 100644
--- a/tests/Network/BitTorrent/Exchange/MessageSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/MessageSpec.hs
@@ -10,10 +10,10 @@ import Data.String
 import Test.Hspec
 import Test.QuickCheck
 
-import Data.Torrent.BitfieldSpec ()
-import Data.Torrent.InfoHashSpec ()
+import Data.TorrentSpec ()
+import Network.BitTorrent.Exchange.BitfieldSpec ()
 import Network.BitTorrent.CoreSpec ()
-import Network.BitTorrent.Core ()
+import Network.BitTorrent.Address ()
 import Network.BitTorrent.Exchange.BlockSpec ()
 import Network.BitTorrent.Exchange.Message
 
diff --git a/tests/Network/BitTorrent/Exchange/SessionSpec.hs b/tests/Network/BitTorrent/Exchange/SessionSpec.hs
index c2c76644..bf5b95a1 100644
--- a/tests/Network/BitTorrent/Exchange/SessionSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/SessionSpec.hs
@@ -3,7 +3,7 @@ module Network.BitTorrent.Exchange.SessionSpec (spec) where
 import Test.Hspec
 
 import Data.Torrent
-import Network.BitTorrent.Core
+import Network.BitTorrent.Address
 import Network.BitTorrent.Exchange.Session
 
 import Config