Rename Network.BitTorrent.DHT.Message -> Network.DHT.Mainline

6 files changed, 5 insertions, 6 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 6ddbd03b..d3764bbb 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -87,7 +87,6 @@ library
                        Network.Address
                        Network.BitTorrent.DHT
                        Network.BitTorrent.DHT.ContactInfo
-                       Network.BitTorrent.DHT.Message
                        Network.BitTorrent.DHT.Query
                        Network.DHT.Routing
                        Network.BitTorrent.DHT.Session
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 5694bd9d..8496dd5a 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -36,7 +36,7 @@ import Network.Address
 import Network.BitTorrent.DHT
 import Network.BitTorrent.DHT.Search
 import Network.BitTorrent.DHT.Query
-import Network.BitTorrent.DHT.Message (FindNode(..),NodeFound(..),GetPeers(..),GotPeers(..))
+import Network.DHT.Mainline (FindNode(..),NodeFound(..),GetPeers(..),GotPeers(..))
 import Network.DatagramServer (QueryFailure(..))
 import Network.DatagramServer.Mainline (ReflectedIP(..),KMessageOf)
 import qualified Network.DHT.Routing as R
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index edc238e6..ae072db0 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -86,7 +86,7 @@ import Network.KRPC.Method    as KRPC
 import Network.DatagramServer.Mainline (ReflectedIP(..))
 import Network.DatagramServer (QueryFailure(..))
 import Data.Torrent
-import Network.BitTorrent.DHT.Message
+import Network.DHT.Mainline
 import Network.DHT.Routing as R
 import Network.BitTorrent.DHT.Session
 import Control.Concurrent.STM
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index e205add4..2d290a95 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -116,7 +116,7 @@ import Network.DatagramServer.Tox as Tox
 import Network.Address
 import Network.BitTorrent.DHT.ContactInfo (PeerStore)
 import qualified Network.BitTorrent.DHT.ContactInfo as P
-import Network.BitTorrent.DHT.Message
+import Network.DHT.Mainline
 import Network.DHT.Routing as R
 import Network.BitTorrent.DHT.Token   as T
 
diff --git a/src/Network/BitTorrent/DHT/Token.hs b/src/Network/BitTorrent/DHT/Token.hs
index 75eadd1a..e3a6b1f6 100644
--- a/src/Network/BitTorrent/DHT/Token.hs
+++ b/src/Network/BitTorrent/DHT/Token.hs
@@ -109,7 +109,7 @@ lookup addr TokenMap {..} = makeToken addr curSecret
 
 -- | Check if token is valid.
 --
--- Typically used to handle 'Network.BitTorrent.DHT.Message.Announce'
+-- Typically used to handle 'Network.DHT.Mainline.Announce'
 -- query. If token is invalid the 'Network.KRPC.ProtocolError' should
 -- be sent back to the malicious node.
 member :: Hashable a => NodeAddr a -> Token -> TokenMap -> Bool
diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/DHT/Mainline.hs
index e21e0e70..a5f4f606 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/DHT/Mainline.hs
@@ -62,7 +62,7 @@
 {-# LANGUAGE UndecidableInstances  #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE TypeFamilies #-}
-module Network.BitTorrent.DHT.Message
+module Network.DHT.Mainline
        ( -- * Envelopes
          Query (..)
        , Response (..)