~ Rename modules.

13 files changed, 53 insertions, 49 deletions

diff --git a/bench/serialization.hs b/bench/serialization.hs
index e7770a1c..8ed90958 100644
--- a/bench/serialization.hs
+++ b/bench/serialization.hs
@@ -6,7 +6,7 @@ import Control.DeepSeq
 import Criterion.Main
 import Data.ByteString (ByteString)
 import Data.Serialize
-import Network.Torrent
+import Network.BitTorrent
 
 
 instance NFData BlockIx where
diff --git a/network-bittorrent.cabal b/network-bittorrent.cabal
index 6fa115e6..5cd46216 100644
--- a/network-bittorrent.cabal
+++ b/network-bittorrent.cabal
@@ -23,14 +23,14 @@ source-repository head
 library
   exposed-modules:     Data.Torrent
                      , Data.Torrent.InfoHash
-                     , Network.Torrent
-                     , Network.Torrent.PeerID
-                     , Network.Torrent.Tracker
-                     , Network.Torrent.Tracker.Scrape
-                     , Network.Torrent.PeerWire
-                     , Network.Torrent.PeerWire.Block
-                     , Network.Torrent.PeerWire.Message
-                     , Network.Torrent.PeerWire.Handshake
+                     , Network.BitTorrent
+                     , Network.BitTorrent.PeerID
+                     , Network.BitTorrent.Tracker
+                     , Network.BitTorrent.Tracker.Scrape
+                     , Network.BitTorrent.PeerWire
+                     , Network.BitTorrent.PeerWire.Block
+                     , Network.BitTorrent.PeerWire.Message
+                     , Network.BitTorrent.PeerWire.Handshake
 
   other-modules:
 
diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
new file mode 100644
index 00000000..9c1977d4
--- /dev/null
+++ b/src/Network/BitTorrent.hs
@@ -0,0 +1,9 @@
+module Network.BitTorrent
+       ( module Network.BitTorrent.PeerID
+       , module Network.BitTorrent.Tracker
+       , module Network.BitTorrent.PeerWire
+       ) where
+
+import Network.BitTorrent.PeerID
+import Network.BitTorrent.Tracker
+import Network.BitTorrent.PeerWire
diff --git a/src/Network/Torrent/PeerID.hs b/src/Network/BitTorrent/PeerID.hs
index 7d928f80..cef1fa58 100644
--- a/src/Network/Torrent/PeerID.hs
+++ b/src/Network/BitTorrent/PeerID.hs
@@ -12,7 +12,7 @@
 --   though this module exports some other goodies for custom generation.
 --
 {-# LANGUAGE OverloadedStrings, GeneralizedNewtypeDeriving #-}
-module Network.Torrent.PeerID
+module Network.BitTorrent.PeerID
        ( -- * Peer addr
          Peer(..)
        , peerSockAddr, connectToPeer
diff --git a/src/Network/BitTorrent/PeerWire.hs b/src/Network/BitTorrent/PeerWire.hs
new file mode 100644
index 00000000..768da5f2
--- /dev/null
+++ b/src/Network/BitTorrent/PeerWire.hs
@@ -0,0 +1,17 @@
+-- |
+--   Copyright   :  (c) Sam T. 2013
+--   License     :  MIT
+--   Maintainer  :  pxqr.sta@gmail.com
+--   Stability   :  experimental
+--   Portability :  portable
+--
+{-# LANGUAGE DoAndIfThenElse #-}
+module Network.BitTorrent.PeerWire
+       ( module Network.BitTorrent.PeerWire.Block
+       , module Network.BitTorrent.PeerWire.Message
+       , module Network.BitTorrent.PeerWire.Handshake
+       ) where
+
+import Network.BitTorrent.PeerWire.Block
+import Network.BitTorrent.PeerWire.Message
+import Network.BitTorrent.PeerWire.Handshake
diff --git a/src/Network/Torrent/PeerWire/Block.hs b/src/Network/BitTorrent/PeerWire/Block.hs
index 056f6b18..33e3dead 100644
--- a/src/Network/Torrent/PeerWire/Block.hs
+++ b/src/Network/BitTorrent/PeerWire/Block.hs
@@ -1,4 +1,4 @@
-module Network.Torrent.PeerWire.Block
+module Network.BitTorrent.PeerWire.Block
        ( BlockIx(..), Block(..)
        , defaultBlockSize
        , blockRange, ixRange, pieceIx
diff --git a/src/Network/Torrent/PeerWire/Handshake.hs b/src/Network/BitTorrent/PeerWire/Handshake.hs
index 733d5785..6ce37887 100644
--- a/src/Network/Torrent/PeerWire/Handshake.hs
+++ b/src/Network/BitTorrent/PeerWire/Handshake.hs
@@ -6,7 +6,7 @@
 --   Portability :  portable
 --
 {-# LANGUAGE OverloadedStrings #-}
-module Network.Torrent.PeerWire.Handshake
+module Network.BitTorrent.PeerWire.Handshake
        ( Handshake
        , handshakeMaxSize
        , defaultBTProtocol, defaultReserved, defaultHandshake
@@ -21,7 +21,9 @@ import Data.Serialize as S
 import Data.Torrent.InfoHash
 import Network
 import Network.Socket.ByteString
-import Network.Torrent.PeerID
+
+import Network.BitTorrent.PeerID
+
 
 -- | In order to establish the connection between peers we should send 'Handshake'
 --   message. The 'Handshake' is a required message and must be the first message
diff --git a/src/Network/Torrent/PeerWire/Message.hs b/src/Network/BitTorrent/PeerWire/Message.hs
index e04038ff..1bcb2ee5 100644
--- a/src/Network/Torrent/PeerWire/Message.hs
+++ b/src/Network/BitTorrent/PeerWire/Message.hs
@@ -1,4 +1,4 @@
-module Network.Torrent.PeerWire.Message
+module Network.BitTorrent.PeerWire.Message
        ( Message(..)
        ) where
 
@@ -8,7 +8,7 @@ import qualified Data.ByteString as B
 
 import Data.Serialize
 
-import Network.Torrent.PeerWire.Block
+import Network.BitTorrent.PeerWire.Block
 
 
 -- TODO comment message constructors
diff --git a/src/Network/Torrent/Tracker.hs b/src/Network/BitTorrent/Tracker.hs
index ffbdc949..3cafbe1d 100644
--- a/src/Network/Torrent/Tracker.hs
+++ b/src/Network/BitTorrent/Tracker.hs
@@ -8,8 +8,8 @@
 --
 {-# OPTIONS -fno-warn-orphans #-}
 {-# LANGUAGE OverloadedStrings #-}
-module Network.Torrent.Tracker
-       ( module Network.Torrent.Tracker.Scrape
+module Network.BitTorrent.Tracker
+       ( module Network.BitTorrent.Tracker.Scrape
 
          -- * Requests
        , Event(..), TRequest(..)
@@ -24,8 +24,6 @@ module Network.Torrent.Tracker
        )
        where
 
-import Network.Torrent.Tracker.Scrape
-
 import Control.Applicative
 import Data.Char as Char
 import Data.Word (Word32)
@@ -44,7 +42,9 @@ import Network
 import Network.Socket
 import Network.HTTP
 import Network.URI
-import Network.Torrent.PeerID
+
+import Network.BitTorrent.PeerID
+import Network.BitTorrent.Tracker.Scrape
 
 
 data Event = Started   -- ^ For first request.
diff --git a/src/Network/Torrent/Tracker/Scrape.hs b/src/Network/BitTorrent/Tracker/Scrape.hs
index f5ebbea4..49451a57 100644
--- a/src/Network/Torrent/Tracker/Scrape.hs
+++ b/src/Network/BitTorrent/Tracker/Scrape.hs
@@ -11,7 +11,7 @@
 --   scrape info for a particular torrent list.
 --
 {-# LANGUAGE OverloadedStrings #-}
-module Network.Torrent.Tracker.Scrape
+module Network.BitTorrent.Tracker.Scrape
        ( ScrapeInfo(..), Scrape
        , scrapeURL
 
diff --git a/src/Network/Torrent.hs b/src/Network/Torrent.hs
deleted file mode 100644
index a37bee41..00000000
--- a/src/Network/Torrent.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-module Network.Torrent
-       ( module Network.Torrent.PeerID
-       , module Network.Torrent.Tracker
-       , module Network.Torrent.PeerWire
-       ) where
-
-import Network.Torrent.PeerID
-import Network.Torrent.Tracker
-import Network.Torrent.PeerWire
diff --git a/src/Network/Torrent/PeerWire.hs b/src/Network/Torrent/PeerWire.hs
deleted file mode 100644
index 887e56d5..00000000
--- a/src/Network/Torrent/PeerWire.hs
+++ /dev/null
@@ -1,17 +0,0 @@
--- |
---   Copyright   :  (c) Sam T. 2013
---   License     :  MIT
---   Maintainer  :  pxqr.sta@gmail.com
---   Stability   :  experimental
---   Portability :  portable
---
-{-# LANGUAGE DoAndIfThenElse #-}
-module Network.Torrent.PeerWire
-       ( module Network.Torrent.PeerWire.Block
-       , module Network.Torrent.PeerWire.Message
-       , module Network.Torrent.PeerWire.Handshake
-       ) where
-
-import Network.Torrent.PeerWire.Block
-import Network.Torrent.PeerWire.Message
-import Network.Torrent.PeerWire.Handshake
diff --git a/tests/encoding.hs b/tests/encoding.hs
index bacf275e..a8490551 100644
--- a/tests/encoding.hs
+++ b/tests/encoding.hs
@@ -11,10 +11,12 @@ import Test.Framework (defaultMain, Test)
 import Test.Framework.Providers.QuickCheck2 (testProperty)
 import Test.QuickCheck
 
-import Data.Torrent
-import Network.Torrent
 import Network.URI
 
+import Data.Torrent
+import Network.BitTorrent
+
+
 positive :: Gen Int
 positive = fromIntegral <$> (arbitrary :: Gen Word32)