Move Infohash and Magnet to Torrent module

7 files changed, 5 insertions, 8 deletions

diff --git a/tests/Data/Torrent/InfoHashSpec.hs b/tests/Data/Torrent/InfoHashSpec.hs
index 06570ec9..9accc741 100644
--- a/tests/Data/Torrent/InfoHashSpec.hs
+++ b/tests/Data/Torrent/InfoHashSpec.hs
@@ -10,8 +10,6 @@ import Test.QuickCheck
 import Test.QuickCheck.Instances ()
 
 import Data.Torrent
-import Data.Torrent.InfoHash as IH
-
 
 instance Arbitrary InfoHash where
   arbitrary = do
diff --git a/tests/Data/Torrent/MagnetSpec.hs b/tests/Data/Torrent/MagnetSpec.hs
index 13554455..838df570 100644
--- a/tests/Data/Torrent/MagnetSpec.hs
+++ b/tests/Data/Torrent/MagnetSpec.hs
@@ -9,7 +9,7 @@ import Test.QuickCheck
 import Test.QuickCheck.Instances ()
 import Network.URI
 
-import Data.Torrent.Magnet
+import Data.Torrent
 import Data.Torrent.InfoHashSpec ()
 
 
diff --git a/tests/Network/BitTorrent/Client/HandleSpec.hs b/tests/Network/BitTorrent/Client/HandleSpec.hs
index 8e16d9b0..d51bab02 100644
--- a/tests/Network/BitTorrent/Client/HandleSpec.hs
+++ b/tests/Network/BitTorrent/Client/HandleSpec.hs
@@ -2,7 +2,7 @@ module Network.BitTorrent.Client.HandleSpec (spec) where
 import Data.Default
 import Test.Hspec
 
-import Data.Torrent.Magnet
+import Data.Torrent
 import Network.BitTorrent.Client
 import Network.BitTorrent.Client.Handle
 
diff --git a/tests/Network/BitTorrent/DHT/TestData.hs b/tests/Network/BitTorrent/DHT/TestData.hs
index 2e000a77..e9473cbb 100644
--- a/tests/Network/BitTorrent/DHT/TestData.hs
+++ b/tests/Network/BitTorrent/DHT/TestData.hs
@@ -3,7 +3,7 @@ module Network.BitTorrent.DHT.TestData
        , testTorrents
        ) where
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 
 data TestEntry = TestEntry
   { entryName  :: String
diff --git a/tests/Network/BitTorrent/DHTSpec.hs b/tests/Network/BitTorrent/DHTSpec.hs
index 76b48257..30abc867 100644
--- a/tests/Network/BitTorrent/DHTSpec.hs
+++ b/tests/Network/BitTorrent/DHTSpec.hs
@@ -6,7 +6,7 @@ import Data.List as L
 import Test.Hspec
 import System.Timeout
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.DHT
 
 
diff --git a/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs b/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
index c21f55ef..ccbf2854 100644
--- a/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
+++ b/tests/Network/BitTorrent/Exchange/ConnectionSpec.hs
@@ -8,7 +8,6 @@ import Test.Hspec
 import Test.QuickCheck
 
 import Data.Torrent
-import Data.Torrent.InfoHash
 import Network.BitTorrent.Core
 import Network.BitTorrent.Exchange.Connection
 import Network.BitTorrent.Exchange.Message
diff --git a/tests/Network/BitTorrent/Tracker/TestData.hs b/tests/Network/BitTorrent/Tracker/TestData.hs
index e0edba25..b95e2df4 100644
--- a/tests/Network/BitTorrent/Tracker/TestData.hs
+++ b/tests/Network/BitTorrent/Tracker/TestData.hs
@@ -12,7 +12,7 @@ import Data.Maybe
 import Data.String
 import Network.URI
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 
 
 data TrackerEntry = TrackerEntry