Rename Network.BitTorrent.DHT.Routing -> Network.DHT.Routing

8 files changed, 18 insertions, 18 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 72487459..c456350f 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -89,7 +89,7 @@ library
                        Network.BitTorrent.DHT.ContactInfo
                        Network.BitTorrent.DHT.Message
                        Network.BitTorrent.DHT.Query
-                       Network.BitTorrent.DHT.Routing
+                       Network.DHT.Routing
                        Network.BitTorrent.DHT.Session
                        Network.BitTorrent.DHT.Token
                        Network.StreamServer
@@ -271,7 +271,7 @@ test-suite spec
                        Network.BitTorrent.DHT.TestData
                        Network.BitTorrent.DHT.MessageSpec
                        Network.BitTorrent.DHT.QuerySpec
-                       Network.BitTorrent.DHT.RoutingSpec
+                       Network.DHT.RoutingSpec
                        Network.BitTorrent.DHT.SessionSpec
                        Network.BitTorrent.DHT.TokenSpec
                        Network.BitTorrent.Internal.CacheSpec
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index ab6ea2c1..2331463d 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -39,7 +39,7 @@ import Network.BitTorrent.DHT.Query
 import Network.BitTorrent.DHT.Message (FindNode(..),NodeFound(..),GetPeers(..),GotPeers(..))
 import Network.DatagramServer (QueryFailure(..))
 import Network.DatagramServer.Mainline (ReflectedIP(..),KMessageOf)
-import qualified Network.BitTorrent.DHT.Routing as R
+import qualified Network.DHT.Routing as R
 import Network.BitTorrent.DHT.Session
 import Network.SocketLike
 import Network.StreamServer
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 0ce2efd7..6a999478 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -195,7 +195,7 @@ import System.FilePath
 import System.Posix.Types
 
 import Network.BitTorrent.Address
-import Network.BitTorrent.DHT.Routing
+import Network.DHT.Routing
 import Network.DatagramServer.Mainline
 
 
diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs
index 169abcfc..13f3744f 100644
--- a/src/Network/BitTorrent/DHT.hs
+++ b/src/Network/BitTorrent/DHT.hs
@@ -68,7 +68,7 @@ import Data.Torrent
 import Network.BitTorrent.Address
 import Network.BitTorrent.DHT.Query
 import Network.BitTorrent.DHT.Session
-import Network.BitTorrent.DHT.Routing as T hiding (null)
+import Network.DHT.Routing as T hiding (null)
 import qualified Data.Text as Text
 import Data.Monoid
 import Network.DatagramServer.Mainline (KMessageOf)
diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index d7fb5e66..34714a6a 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -24,7 +24,7 @@
 --
 --     * 'FindNode' query /may/ trigger 'Ping' query to check if a
 --     list of nodes to return is /good/. See
---     'Network.BitTorrent.DHT.Routing.Routing' for further explanation.
+--     'Network.DHT.Routing.Routing' for further explanation.
 --
 --     * 'GetPeers' query may trigger 'Ping' query for the same reason.
 --
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 9adad163..cd2b5119 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -87,7 +87,7 @@ import Network.DatagramServer.Mainline (ReflectedIP(..))
 import Network.DatagramServer (QueryFailure(..))
 import Data.Torrent
 import Network.BitTorrent.DHT.Message
-import Network.BitTorrent.DHT.Routing as R
+import Network.DHT.Routing as R
 import Network.BitTorrent.DHT.Session
 import Control.Concurrent.STM
 import qualified Network.BitTorrent.DHT.Search as Search
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index 0c819620..730c0059 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -117,7 +117,7 @@ import Network.BitTorrent.Address
 import Network.BitTorrent.DHT.ContactInfo (PeerStore)
 import qualified Network.BitTorrent.DHT.ContactInfo as P
 import Network.BitTorrent.DHT.Message
-import Network.BitTorrent.DHT.Routing as R
+import Network.DHT.Routing as R
 import Network.BitTorrent.DHT.Token   as T
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/DHT/Routing.hs
index 54c0f7c5..c0a431fa 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/DHT/Routing.hs
@@ -22,7 +22,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving, FlexibleContexts, MultiParamTypeClasses, FlexibleInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module Network.BitTorrent.DHT.Routing
+module Network.DHT.Routing
        ( -- * Table
          Table
        , Info(..)
@@ -35,12 +35,12 @@ module Network.BitTorrent.DHT.Routing
        , NodeCount
 
          -- * Query
-       , Network.BitTorrent.DHT.Routing.null
-       , Network.BitTorrent.DHT.Routing.full
+       , Network.DHT.Routing.null
+       , Network.DHT.Routing.full
        , thisId
        , shape
-       , Network.BitTorrent.DHT.Routing.size
-       , Network.BitTorrent.DHT.Routing.depth
+       , Network.DHT.Routing.size
+       , Network.DHT.Routing.depth
        , compatibleNodeId
 
          -- * Lookup
@@ -50,14 +50,14 @@ module Network.BitTorrent.DHT.Routing
        , kclosest
 
          -- * Construction
-       , Network.BitTorrent.DHT.Routing.nullTable
+       , Network.DHT.Routing.nullTable
        , Event(..)
        , CheckPing(..)
-       , Network.BitTorrent.DHT.Routing.insert
+       , Network.DHT.Routing.insert
 
          -- * Conversion
-       , Network.BitTorrent.DHT.Routing.TableEntry
-       , Network.BitTorrent.DHT.Routing.toList
+       , Network.DHT.Routing.TableEntry
+       , Network.DHT.Routing.toList
 
          -- * Routing
        , Timestamp
@@ -363,7 +363,7 @@ data Table dht ip u
     deriving Generic
 
 instance (Eq ip, Eq (NodeId dht)) => Eq (Table dht ip u) where
-  (==) = (==) `on` Network.BitTorrent.DHT.Routing.toList
+  (==) = (==) `on` Network.DHT.Routing.toList
 
 instance Serialize NominalDiffTime where
   put = putWord32be . fromIntegral   . fromEnum