Hide progress module

7 files changed, 11 insertions, 11 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 0ceec550..d8cf0a01 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -49,7 +49,7 @@ library
                      , RecordWildCards
   hs-source-dirs:      src
   exposed-modules:     Data.Torrent
-                       Data.Torrent.Progress
+
                        Network.BitTorrent
                        Network.BitTorrent.Address
                        Network.BitTorrent.Client
@@ -84,12 +84,14 @@ library
   if flag(testing)
     exposed-modules:
                        Network.BitTorrent.Internal.Cache
+                       Network.BitTorrent.Internal.Progress
                        Network.BitTorrent.Internal.Types
                        System.Torrent.FileMap
                        System.Torrent.Tree
   else
     other-modules:
                        Network.BitTorrent.Internal.Cache
+                       Network.BitTorrent.Internal.Progress
                        Network.BitTorrent.Internal.Types
                        System.Torrent.FileMap
                        System.Torrent.Tree
@@ -185,7 +187,6 @@ test-suite spec
                        Config
 
                        Data.TorrentSpec
-                       Data.Torrent.ProgressSpec
                        Network.BitTorrent.Client.HandleSpec
                        Network.BitTorrent.CoreSpec
                        Network.BitTorrent.DHTSpec
@@ -196,6 +197,7 @@ test-suite spec
                        Network.BitTorrent.DHT.SessionSpec
                        Network.BitTorrent.DHT.TokenSpec
                        Network.BitTorrent.Internal.CacheSpec
+                       Network.BitTorrent.Internal.ProgressSpec
                        Network.BitTorrent.Tracker.TestData
                        Network.BitTorrent.Tracker.ListSpec
                        Network.BitTorrent.Tracker.MessageSpec
diff --git a/src/Data/Torrent/Progress.hs b/src/Network/BitTorrent/Internal/Progress.hs
index 4719020a..9aff9935 100644
--- a/src/Data/Torrent/Progress.hs
+++ b/src/Network/BitTorrent/Internal/Progress.hs
@@ -13,7 +13,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE ViewPatterns    #-}
 {-# OPTIONS -fno-warn-orphans #-}
-module Data.Torrent.Progress
+module Network.BitTorrent.Internal.Progress
        ( -- * Progress
          Progress (..)
 
@@ -39,7 +39,6 @@ import Control.Lens hiding ((%=))
 import Data.ByteString.Lazy.Builder  as BS
 import Data.ByteString.Lazy.Builder.ASCII as BS
 import Data.Default
-import Data.List as L
 import Data.Monoid
 import Data.Serialize as S
 import Data.Ratio
diff --git a/src/Network/BitTorrent/Tracker/Message.hs b/src/Network/BitTorrent/Tracker/Message.hs
index d251d0ad..e4a41045 100644
--- a/src/Network/BitTorrent/Tracker/Message.hs
+++ b/src/Network/BitTorrent/Tracker/Message.hs
@@ -125,9 +125,8 @@ import System.Entropy
 import Text.Read (readMaybe)
 
 import Data.Torrent
-import Data.Torrent.Progress
 import Network.BitTorrent.Address
-
+import Network.BitTorrent.Internal.Progress
 
 {-----------------------------------------------------------------------
 --  Events
diff --git a/src/Network/BitTorrent/Tracker/RPC.hs b/src/Network/BitTorrent/Tracker/RPC.hs
index ecb1001c..6fd22b25 100644
--- a/src/Network/BitTorrent/Tracker/RPC.hs
+++ b/src/Network/BitTorrent/Tracker/RPC.hs
@@ -37,8 +37,8 @@ import Network.URI
 import Network.Socket (HostAddress)
 
 import           Data.Torrent
-import           Data.Torrent.Progress
 import           Network.BitTorrent.Address
+import           Network.BitTorrent.Internal.Progress
 import           Network.BitTorrent.Tracker.Message
 import qualified Network.BitTorrent.Tracker.RPC.HTTP as HTTP
 import qualified Network.BitTorrent.Tracker.RPC.UDP  as UDP
diff --git a/tests/Data/Torrent/ProgressSpec.hs b/tests/Network/BitTorrent/Internal/ProgressSpec.hs
index 32efbd7a..acbfd84c 100644
--- a/tests/Data/Torrent/ProgressSpec.hs
+++ b/tests/Network/BitTorrent/Internal/ProgressSpec.hs
@@ -1,9 +1,9 @@
 {-# OPTIONS -fno-warn-orphans #-}
-module Data.Torrent.ProgressSpec (spec) where
+module Network.BitTorrent.Internal.ProgressSpec (spec) where
 import Control.Applicative
 import Test.Hspec
 import Test.QuickCheck
-import Data.Torrent.Progress
+import Network.BitTorrent.Internal.Progress
 
 
 instance Arbitrary Progress where
diff --git a/tests/Network/BitTorrent/Tracker/MessageSpec.hs b/tests/Network/BitTorrent/Tracker/MessageSpec.hs
index 92fd8d79..29854d58 100644
--- a/tests/Network/BitTorrent/Tracker/MessageSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/MessageSpec.hs
@@ -17,7 +17,7 @@ import Test.Hspec
 import Test.QuickCheck
 
 import Data.TorrentSpec ()
-import Data.Torrent.ProgressSpec ()
+import Network.BitTorrent.Internal.ProgressSpec ()
 import Network.BitTorrent.Address ()
 import Network.BitTorrent.Address ()
 
diff --git a/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs b/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
index 65f58911..e928f917 100644
--- a/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPC/HTTPSpec.hs
@@ -5,7 +5,7 @@ import Data.Default
 import Data.List as L
 import Test.Hspec
 
-import Data.Torrent.Progress
+import Network.BitTorrent.Internal.Progress
 import Network.BitTorrent.Tracker.Message as Message
 import Network.BitTorrent.Tracker.RPC.HTTP