Move Infohash and Magnet to Torrent module

22 files changed, 496 insertions, 575 deletions

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index b233937b..5efff598 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -17,16 +17,42 @@
 --   <https://wiki.theory.org/BitTorrentSpecification#Metainfo_File_Structure>
 --
 {-# LANGUAGE CPP                        #-}
+{-# LANGUAGE NamedFieldPuns             #-}
 {-# LANGUAGE FlexibleInstances          #-}
 {-# LANGUAGE OverlappingInstances       #-}
+{-# LANGUAGE MultiParamTypeClasses      #-}
 {-# LANGUAGE BangPatterns               #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# OPTIONS -fno-warn-orphans           #-}
 module Data.Torrent
-       ( -- * Info dictionary
-         InfoDict (..)
+       ( -- * InfoHash
+         -- $infohash
+         InfoHash
+       , textToInfoHash
+       , longHex
+       , shortHex
+
+         -- * Magnet
+         -- $magnet-link
+       , Magnet(..)
+       , nullMagnet
+       , simpleMagnet
+       , detailedMagnet
+       , parseMagnet
+       , renderMagnet
+
+         -- ** URN
+       , URN (..)
+       , NamespaceId
+       , btih
+       , infohashURN
+       , parseURN
+       , renderURN
+
+         -- * Info dictionary
+       , InfoDict (..)
        , infoDictionary
 
          -- ** Lenses
@@ -67,34 +93,171 @@ module Data.Torrent
 
 import Prelude hiding (sum)
 import Control.Applicative
-import qualified Crypto.Hash.SHA1 as C
 import Control.DeepSeq
 import Control.Exception
-import Control.Lens
+import Control.Lens hiding (unsnoc)
+import Control.Monad
+import qualified Crypto.Hash.SHA1 as C
 import Data.BEncode as BE
 import Data.BEncode.Types as BE
 import           Data.ByteString as BS
+import           Data.ByteString.Base16 as Base16
+import           Data.ByteString.Base32 as Base32
+import           Data.ByteString.Base64 as Base64
 import qualified Data.ByteString.Char8 as BC (pack, unpack)
 import qualified Data.ByteString.Lazy  as BL
+import           Data.Char
 import           Data.Convertible
 import           Data.Default
 import           Data.Hashable   as Hashable
 import qualified Data.List as L
+import           Data.Map as M
+import           Data.Maybe
+import           Data.Serialize as S
+import           Data.String
 import           Data.Text as T
-import Data.Time
+import           Data.Text.Encoding as T
+import           Data.Text.Read
 import Data.Time.Clock.POSIX
 import Data.Typeable
 import Network (HostName)
+import Network.HTTP.Types.QueryLike
+import Network.HTTP.Types.URI
 import Network.URI
+import Text.ParserCombinators.ReadP as P
 import Text.PrettyPrint as PP
 import Text.PrettyPrint.Class
 import System.FilePath
 
-import Data.Torrent.InfoHash as IH
 import Data.Torrent.Layout
 import Data.Torrent.Piece
 import Network.BitTorrent.Core.NodeInfo
 
+
+{-----------------------------------------------------------------------
+--  Info hash
+-----------------------------------------------------------------------}
+-- TODO
+--
+-- data Word160 = Word160 {-# UNPACK #-} !Word64
+--                        {-# UNPACK #-} !Word64
+--                        {-# UNPACK #-} !Word32
+--
+-- newtype InfoHash = InfoHash Word160
+--
+-- reason: bytestring have overhead = 8 words, while infohash have length 20 bytes
+
+-- $infohash
+--
+-- Infohash is a unique identifier of torrent.
+
+-- | Exactly 20 bytes long SHA1 hash of the info part of torrent file.
+newtype InfoHash = InfoHash { getInfoHash :: BS.ByteString }
+  deriving (Eq, Ord, Typeable)
+
+infoHashLen :: Int
+infoHashLen = 20
+
+-- | Meaningless placeholder value.
+instance Default InfoHash where
+  def = "0123456789012345678901234567890123456789"
+
+-- | Hash raw bytes. (no encoding)
+instance Hashable InfoHash where
+  hashWithSalt s (InfoHash ih) = hashWithSalt s ih
+  {-# INLINE hashWithSalt #-}
+
+-- | Convert to\/from raw bencoded string. (no encoding)
+instance BEncode InfoHash where
+  toBEncode = toBEncode . getInfoHash
+  fromBEncode be = InfoHash <$> fromBEncode be
+
+-- | Convert to\/from raw bytestring. (no encoding)
+instance Serialize InfoHash where
+  put (InfoHash ih) = putByteString ih
+  {-# INLINE put #-}
+
+  get = InfoHash <$> getBytes infoHashLen
+  {-# INLINE get #-}
+
+-- | Convert to raw query value. (no encoding)
+instance QueryValueLike InfoHash where
+  toQueryValue (InfoHash ih) = Just ih
+  {-# INLINE toQueryValue #-}
+
+-- | Convert to base16 encoded string.
+instance Show InfoHash where
+  show (InfoHash ih) = BC.unpack (Base16.encode ih)
+
+-- | Convert to base16 encoded Doc string.
+instance Pretty InfoHash where
+  pretty = text . show
+
+-- | Read base16 encoded string.
+instance Read InfoHash where
+  readsPrec _ = readP_to_S $ do
+      str <- replicateM (infoHashLen * 2) (satisfy isHexDigit)
+      return $ InfoHash $ decodeIH str
+    where
+      decodeIH       = BS.pack . L.map fromHex . pair
+      fromHex (a, b) = read $ '0' : 'x' : a : b : []
+
+      pair (a : b : xs) = (a, b) : pair xs
+      pair _            = []
+
+-- | Convert raw bytes to info hash.
+instance Convertible BS.ByteString InfoHash where
+  safeConvert bs
+    | BS.length bs == infoHashLen = pure (InfoHash bs)
+    |          otherwise          = convError "invalid length" bs
+
+-- | Parse infohash from base16\/base32\/base64 encoded string.
+instance Convertible Text InfoHash where
+  safeConvert t
+      | 20 == hashLen = pure (InfoHash hashStr)
+      | 26 <= hashLen && hashLen <= 28 =
+        case Base64.decode hashStr of
+          Left  msg   -> convError ("invalid base64 encoding " ++ msg) t
+          Right ihStr -> safeConvert ihStr
+
+      |      hashLen == 32   =
+        case Base32.decode hashStr of
+          Left  msg   -> convError msg t
+          Right ihStr -> safeConvert ihStr
+
+      |      hashLen == 40   =
+        let (ihStr, inv) = Base16.decode hashStr
+        in if BS.length inv /= 0
+           then convError "invalid base16 encoding" t
+           else safeConvert ihStr
+
+      |        otherwise     = convError "invalid length" t
+    where
+      hashLen = BS.length hashStr
+      hashStr = T.encodeUtf8 t
+
+-- | Decode from base16\/base32\/base64 encoded string.
+instance IsString InfoHash where
+  fromString = either (error . prettyConvertError) id . safeConvert . T.pack
+
+ignoreErrorMsg :: Either a b -> Maybe b
+ignoreErrorMsg = either (const Nothing) Just
+
+-- | Tries both base16 and base32 while decoding info hash.
+--
+--  Use 'safeConvert' for detailed error messages.
+--
+textToInfoHash :: Text -> Maybe InfoHash
+textToInfoHash = ignoreErrorMsg . safeConvert
+
+-- | Hex encode infohash to text, full length.
+longHex :: InfoHash -> Text
+longHex = T.decodeUtf8 . Base16.encode . getInfoHash
+
+-- | The same as 'longHex', but only first 7 characters.
+shortHex :: InfoHash -> Text
+shortHex = T.take 7 . longHex
+
 {-----------------------------------------------------------------------
 --  Info dictionary
 -----------------------------------------------------------------------}
@@ -145,9 +308,9 @@ instance Default InfoDict where
 infoDictionary :: LayoutInfo -> PieceInfo -> Bool -> InfoDict
 infoDictionary li pinfo private = InfoDict ih li pinfo private
   where
-    ih = hashLazyIH $ encode $ InfoDict def li pinfo private
+    ih = hashLazyIH $ BE.encode $ InfoDict def li pinfo private
 
-getPrivate :: Get Bool
+getPrivate :: BE.Get Bool
 getPrivate = (Just True ==) <$>? "private"
 
 putPrivate :: Bool -> BDict -> BDict
@@ -172,7 +335,7 @@ instance BEncode InfoDict where
                   <*> getPieceInfo
                   <*> getPrivate
     where
-      ih = hashLazyIH (encode dict)
+      ih = hashLazyIH (BE.encode dict)
 
 ppPrivacy :: Bool -> Doc
 ppPrivacy privacy = "Privacy: " <> if privacy then "private" else "public"
@@ -361,10 +524,314 @@ isTorrentPath filepath = takeExtension filepath == extSeparator : torrentExt
 fromFile :: FilePath -> IO Torrent
 fromFile filepath = do
   contents <- BS.readFile filepath
-  case decode contents of
+  case BE.decode contents of
     Right !t -> return t
     Left msg -> throwIO $ userError $ msg ++ " while reading torrent file"
 
 -- | Encode and write a .torrent file.
 toFile :: FilePath -> Torrent -> IO ()
-toFile filepath = BL.writeFile filepath . encode
+toFile filepath = BL.writeFile filepath . BE.encode
+
+{-----------------------------------------------------------------------
+--  URN
+-----------------------------------------------------------------------}
+
+-- | Namespace identifier determines the syntactic interpretation of
+-- namespace-specific string.
+type NamespaceId = [Text]
+
+-- | BitTorrent Info Hash (hence the name) namespace
+-- identifier. Namespace-specific string /should/ be a base16\/base32
+-- encoded SHA1 hash of the corresponding torrent /info/ dictionary.
+--
+btih :: NamespaceId
+btih  = ["btih"]
+
+-- | URN is pesistent location-independent identifier for
+--   resources. In particular, URNs are used represent torrent names
+--   as a part of magnet link, see 'Data.Torrent.Magnet.Magnet' for
+--   more info.
+--
+data URN = URN
+  { urnNamespace :: NamespaceId -- ^ a namespace identifier;
+  , urnString    :: Text        -- ^ a corresponding
+                                -- namespace-specific string.
+  } deriving (Eq, Ord, Typeable)
+
+-----------------------------------------------------------------------
+
+instance Convertible URN InfoHash where
+  safeConvert u @ URN {..}
+    | urnNamespace /= btih = convError "invalid namespace" u
+    |       otherwise      = safeConvert urnString
+
+-- | Make resource name for torrent with corresponding
+-- infohash. Infohash is base16 (hex) encoded.
+--
+infohashURN :: InfoHash -> URN
+infohashURN = URN btih . longHex
+
+-- | Meaningless placeholder value.
+instance Default URN where
+  def = infohashURN def
+
+------------------------------------------------------------------------
+
+-- | Render URN to its text representation.
+renderURN :: URN -> Text
+renderURN URN {..}
+  = T.intercalate ":" $ "urn" : urnNamespace ++ [urnString]
+
+instance Pretty URN where
+  pretty = text . T.unpack . renderURN
+
+instance Show URN where
+  showsPrec n = showsPrec n . T.unpack . renderURN
+
+instance QueryValueLike URN where
+  toQueryValue = toQueryValue . renderURN
+  {-# INLINE toQueryValue #-}
+
+-----------------------------------------------------------------------
+
+unsnoc :: [a] -> Maybe ([a], a)
+unsnoc [] = Nothing
+unsnoc xs = Just (L.init xs, L.last xs)
+
+instance Convertible Text URN where
+  safeConvert t = case T.split (== ':') t of
+    uriScheme : body
+      | T.toLower uriScheme == "urn" ->
+        case unsnoc body of
+          Just (namespace, val) -> pure URN
+            { urnNamespace = namespace
+            , urnString    = val
+            }
+          Nothing -> convError "missing URN string" body
+      | otherwise -> convError "invalid URN scheme" uriScheme
+    []            -> convError "missing URN scheme" t
+
+instance IsString URN where
+  fromString = either (error . prettyConvertError) id
+             . safeConvert . T.pack
+
+-- | Try to parse an URN from its text representation.
+--
+--  Use 'safeConvert' for detailed error messages.
+--
+parseURN :: Text -> Maybe URN
+parseURN = either (const Nothing) pure . safeConvert
+
+{-----------------------------------------------------------------------
+--  Magnet
+-----------------------------------------------------------------------}
+-- $magnet-link
+--
+--   Magnet URI scheme is an standard defining Magnet links. Magnet
+--   links are refer to resources by hash, in particular magnet links
+--   can refer to torrent using corresponding infohash. In this way,
+--   magnet links can be used instead of torrent files.
+--
+--   This module provides bittorrent specific implementation of magnet
+--   links.
+--
+--   For generic magnet uri scheme see:
+--   <http://magnet-uri.sourceforge.net/magnet-draft-overview.txt>,
+--   <http://www.iana.org/assignments/uri-schemes/prov/magnet>
+--
+--   Bittorrent specific details:
+--   <http://www.bittorrent.org/beps/bep_0009.html>
+--
+
+-- TODO multiple exact topics
+-- TODO render/parse supplement for URI/query
+
+-- | An URI used to identify torrent.
+data Magnet = Magnet
+  { -- | Torrent infohash hash. Can be used in DHT queries if no
+    -- 'tracker' provided.
+    exactTopic  :: !InfoHash -- TODO InfoHash -> URN?
+
+    -- | A filename for the file to download. Can be used to
+    -- display name while waiting for metadata.
+  , displayName :: Maybe Text
+
+    -- | Size of the resource in bytes.
+  , exactLength :: Maybe Integer
+
+    -- | URI pointing to manifest, e.g. a list of further items.
+  , manifest :: Maybe Text
+
+    -- | Search string.
+  , keywordTopic :: Maybe Text
+
+    -- | A source to be queried after not being able to find and
+    -- download the file in the bittorrent network in a defined
+    -- amount of time.
+  , acceptableSource :: Maybe URI
+
+    -- | Direct link to the resource.
+  , exactSource      :: Maybe URI
+
+    -- | URI to the tracker.
+  , tracker :: Maybe URI
+
+    -- | Additional or experimental parameters.
+  , supplement :: Map Text Text
+  } deriving (Eq, Ord, Typeable)
+
+instance QueryValueLike Integer where
+  toQueryValue = toQueryValue . show
+
+instance QueryValueLike URI where
+  toQueryValue = toQueryValue . show
+
+instance QueryLike Magnet where
+  toQuery Magnet {..} =
+    [ ("xt", toQueryValue $ infohashURN exactTopic)
+    , ("dn", toQueryValue displayName)
+    , ("xl", toQueryValue exactLength)
+    , ("mt", toQueryValue manifest)
+    , ("kt", toQueryValue keywordTopic)
+    , ("as", toQueryValue acceptableSource)
+    , ("xs", toQueryValue exactSource)
+    , ("tr", toQueryValue tracker)
+    ]
+
+instance QueryValueLike Magnet where
+  toQueryValue = toQueryValue . renderMagnet
+
+instance Convertible QueryText Magnet where
+  safeConvert xs = do
+      urnStr   <- getTextMsg "xt" "exact topic not defined" xs
+      infoHash <- convertVia (error "safeConvert" :: URN)  urnStr
+      return Magnet
+        { exactTopic       = infoHash
+        , displayName      = getText "dn" xs
+        , exactLength      = getText "xl" xs >>= getInt
+        , manifest         = getText "mt" xs
+        , keywordTopic     = getText "kt" xs
+        , acceptableSource = getText "as" xs >>= getURI
+        , exactSource      = getText "xs" xs >>= getURI
+        , tracker          = getText "tr" xs >>= getURI
+        , supplement       = M.empty
+        }
+    where
+      getInt    = either (const Nothing) (Just . fst) . signed decimal
+      getURI    = parseURI . T.unpack
+      getText p = join . L.lookup p
+      getTextMsg p msg ps = maybe (convError msg xs) pure $ getText p ps
+
+magnetScheme :: URI
+magnetScheme = URI
+    { uriScheme    = "magnet:"
+    , uriAuthority = Nothing
+    , uriPath      = ""
+    , uriQuery     = ""
+    , uriFragment  = ""
+    }
+
+isMagnetURI :: URI -> Bool
+isMagnetURI u = u { uriQuery = "" } == magnetScheme
+
+-- | Can be used instead of 'parseMagnet'.
+instance Convertible URI Magnet where
+  safeConvert u @ URI {..}
+    | not (isMagnetURI u) = convError "this is not a magnet link" u
+    |      otherwise      = safeConvert $ parseQueryText $ BC.pack uriQuery
+
+-- | Can be used instead of 'renderMagnet'.
+instance Convertible Magnet URI where
+  safeConvert m = pure $ magnetScheme
+    { uriQuery = BC.unpack $ renderQuery True $ toQuery m }
+
+instance Convertible String Magnet where
+  safeConvert str
+    | Just uri <- parseURI str = safeConvert uri
+    |        otherwise         = convError "unable to parse uri" str
+
+------------------------------------------------------------------------
+
+-- | Meaningless placeholder value.
+instance Default Magnet where
+  def = Magnet
+    { exactTopic       = def
+    , displayName      = Nothing
+    , exactLength      = Nothing
+    , manifest         = Nothing
+    , keywordTopic     = Nothing
+    , acceptableSource = Nothing
+    , exactSource      = Nothing
+    , tracker          = Nothing
+    , supplement       = M.empty
+    }
+
+-- | Set 'exactTopic' ('xt' param) only, other params are empty.
+nullMagnet :: InfoHash -> Magnet
+nullMagnet u = Magnet
+    { exactTopic   = u
+    , displayName  = Nothing
+    , exactLength  = Nothing
+    , manifest     = Nothing
+    , keywordTopic = Nothing
+    , acceptableSource = Nothing
+    , exactSource      = Nothing
+    , tracker    = Nothing
+    , supplement = M.empty
+    }
+
+-- | Like 'nullMagnet' but also include 'displayName' ('dn' param).
+simpleMagnet :: Torrent -> Magnet
+simpleMagnet Torrent {tInfoDict = InfoDict {..}}
+  = (nullMagnet idInfoHash)
+    { displayName = Just $ T.decodeUtf8 $ suggestedName idLayoutInfo
+    }
+
+-- | Like 'simpleMagnet' but also include 'exactLength' ('xl' param) and
+-- 'tracker' ('tr' param).
+--
+detailedMagnet :: Torrent -> Magnet
+detailedMagnet t @ Torrent {tInfoDict = InfoDict {..}, tAnnounce}
+  = (simpleMagnet t)
+    { exactLength = Just $ fromIntegral $ contentLength idLayoutInfo
+    , tracker     = tAnnounce
+    }
+
+-----------------------------------------------------------------------
+
+parseMagnetStr :: String -> Maybe Magnet
+parseMagnetStr = either (const Nothing) Just . safeConvert
+
+renderMagnetStr :: Magnet -> String
+renderMagnetStr = show . (convert :: Magnet -> URI)
+
+instance Pretty Magnet where
+  pretty = PP.text . renderMagnetStr
+
+instance Show Magnet where
+  show = renderMagnetStr
+  {-# INLINE show #-}
+
+instance Read Magnet where
+  readsPrec _ xs
+      | Just m <- parseMagnetStr mstr = [(m, rest)]
+      | otherwise = []
+    where
+      (mstr, rest) = L.break (== ' ') xs
+
+instance IsString Magnet where
+  fromString str = fromMaybe (error msg) $ parseMagnetStr str
+    where
+      msg = "unable to parse magnet: " ++ str
+
+-- | Try to parse magnet link from urlencoded string. Use
+-- 'safeConvert' to find out error location.
+--
+parseMagnet :: Text -> Maybe Magnet
+parseMagnet = parseMagnetStr . T.unpack
+{-# INLINE parseMagnet #-}
+
+-- | Render magnet link to urlencoded string
+renderMagnet :: Magnet -> Text
+renderMagnet = T.pack . renderMagnetStr
+{-# INLINE renderMagnet #-}
diff --git a/src/Data/Torrent/InfoHash.hs b/src/Data/Torrent/InfoHash.hs
deleted file mode 100644
index f322ac6f..00000000
--- a/src/Data/Torrent/InfoHash.hs
+++ /dev/null
@@ -1,164 +0,0 @@
--- |
---   Copyright   :  (c) Sam Truzjan 2013
---   License     :  BSD3
---   Maintainer  :  pxqr.sta@gmail.com
---   Stability   :  provisional
---   Portability :  portable
---
---   Infohash is a unique identifier of torrent.
---
-{-# LANGUAGE FlexibleInstances          #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE MultiParamTypeClasses      #-}
-{-# LANGUAGE DeriveDataTypeable         #-}
-module Data.Torrent.InfoHash
-       ( InfoHash
-
-         -- * Parsing
-       , textToInfoHash
-
-         -- * Rendering
-       , longHex
-       , shortHex
-       ) where
-
-import Control.Applicative
-import Control.Monad
-import Data.BEncode
-import Data.ByteString as BS
-import Data.ByteString.Char8 as BC
-import Data.ByteString.Base16 as Base16
-import Data.ByteString.Base32 as Base32
-import Data.ByteString.Base64 as Base64
-import Data.Char
-import Data.Convertible.Base
-import Data.Default
-import Data.List       as L
-import Data.Hashable   as Hashable
-import Data.Serialize
-import Data.String
-import Data.Text as T
-import Data.Text.Encoding as T
-import Data.Typeable
-import Network.HTTP.Types.QueryLike
-import Text.ParserCombinators.ReadP as P
-import Text.PrettyPrint
-import Text.PrettyPrint.Class
-
-
--- TODO
---
--- data Word160 = Word160 {-# UNPACK #-} !Word64
---                        {-# UNPACK #-} !Word64
---                        {-# UNPACK #-} !Word32
---
--- newtype InfoHash = InfoHash Word160
---
--- reason: bytestring have overhead = 8 words, while infohash have length 20 bytes
-
--- | Exactly 20 bytes long SHA1 hash of the info part of torrent file.
-newtype InfoHash = InfoHash { getInfoHash :: BS.ByteString }
-                   deriving (Eq, Ord, Typeable)
-
-infoHashLen :: Int
-infoHashLen = 20
-
--- | Meaningless placeholder value.
-instance Default InfoHash where
-  def = "0123456789012345678901234567890123456789"
-
--- | Hash raw bytes. (no encoding)
-instance Hashable InfoHash where
-  hashWithSalt s (InfoHash ih) = hashWithSalt s ih
-  {-# INLINE hashWithSalt #-}
-
--- | Convert to\/from raw bencoded string. (no encoding)
-instance BEncode InfoHash where
-  toBEncode = toBEncode . getInfoHash
-  fromBEncode be = InfoHash <$> fromBEncode be
-
--- | Convert to\/from raw bytestring. (no encoding)
-instance Serialize InfoHash where
-  put (InfoHash ih) = putByteString ih
-  {-# INLINE put #-}
-
-  get = InfoHash <$> getBytes infoHashLen
-  {-# INLINE get #-}
-
--- | Convert to raw query value. (no encoding)
-instance QueryValueLike InfoHash where
-  toQueryValue (InfoHash ih) = Just ih
-  {-# INLINE toQueryValue #-}
-
--- | Convert to base16 encoded string.
-instance Show InfoHash where
-  show (InfoHash ih) = BC.unpack (Base16.encode ih)
-
--- | Convert to base16 encoded Doc string.
-instance Pretty InfoHash where
-  pretty = text . show
-
--- | Read base16 encoded string.
-instance Read InfoHash where
-  readsPrec _ = readP_to_S $ do
-      str <- replicateM (infoHashLen * 2) (satisfy isHexDigit)
-      return $ InfoHash $ decodeIH str
-    where
-      decodeIH       = BS.pack . L.map fromHex . pair
-      fromHex (a, b) = read $ '0' : 'x' : a : b : []
-
-      pair (a : b : xs) = (a, b) : pair xs
-      pair _            = []
-
--- | Convert raw bytes to info hash.
-instance Convertible BS.ByteString InfoHash where
-  safeConvert bs
-    | BS.length bs == infoHashLen = pure (InfoHash bs)
-    |          otherwise          = convError "invalid length" bs
-
--- | Parse infohash from base16\/base32\/base64 encoded string.
-instance Convertible Text InfoHash where
-  safeConvert t
-      | 20 == hashLen = pure (InfoHash hashStr)
-      | 26 <= hashLen && hashLen <= 28 =
-        case Base64.decode hashStr of
-          Left  msg   -> convError ("invalid base64 encoding " ++ msg) t
-          Right ihStr -> safeConvert ihStr
-
-      |      hashLen == 32   =
-        case Base32.decode hashStr of
-          Left  msg   -> convError msg t
-          Right ihStr -> safeConvert ihStr
-
-      |      hashLen == 40   =
-        let (ihStr, inv) = Base16.decode hashStr
-        in if BS.length inv /= 0
-           then convError "invalid base16 encoding" t
-           else safeConvert ihStr
-
-      |        otherwise     = convError "invalid length" t
-    where
-      hashLen = BS.length hashStr
-      hashStr = T.encodeUtf8 t
-
--- | Decode from base16\/base32\/base64 encoded string.
-instance IsString InfoHash where
-  fromString = either (error . prettyConvertError) id . safeConvert . T.pack
-
-ignoreErrorMsg :: Either a b -> Maybe b
-ignoreErrorMsg = either (const Nothing) Just
-
--- | Tries both base16 and base32 while decoding info hash.
---
---  Use 'safeConvert' for detailed error messages.
---
-textToInfoHash :: Text -> Maybe InfoHash
-textToInfoHash = ignoreErrorMsg . safeConvert
-
--- | Hex encode infohash to text, full length.
-longHex :: InfoHash -> Text
-longHex = T.decodeUtf8 . Base16.encode . getInfoHash
-
--- | The same as 'longHex', but only first 7 characters.
-shortHex :: InfoHash -> Text
-shortHex = T.take 7 . longHex
diff --git a/src/Data/Torrent/Magnet.hs b/src/Data/Torrent/Magnet.hs
deleted file mode 100644
index aad0debe..00000000
--- a/src/Data/Torrent/Magnet.hs
+++ /dev/null
@@ -1,372 +0,0 @@
--- |
---   Copyright   :  (c) Sam Truzjan 2013
---   License     :  BSD3
---   Maintainer  :  pxqr.sta@gmail.com
---   Stability   :  provisional
---   Portability :  portable
---
---   Magnet URI scheme is an standard defining Magnet links. Magnet
---   links are refer to resources by hash, in particular magnet links
---   can refer to torrent using corresponding infohash. In this way,
---   magnet links can be used instead of torrent files.
---
---   This module provides bittorrent specific implementation of magnet
---   links.
---
---   For generic magnet uri scheme see:
---   <http://magnet-uri.sourceforge.net/magnet-draft-overview.txt>,
---   <http://www.iana.org/assignments/uri-schemes/prov/magnet>
---
---   Bittorrent specific details:
---   <http://www.bittorrent.org/beps/bep_0009.html>
---
-{-# LANGUAGE NamedFieldPuns        #-}
-{-# LANGUAGE FlexibleInstances     #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE TypeSynonymInstances  #-}
-{-# LANGUAGE DeriveDataTypeable    #-}
-{-# OPTIONS -fno-warn-orphans      #-}
-module Data.Torrent.Magnet
-       ( -- * Magnet
-         Magnet(..)
-
-         -- ** Construction
-       , nullMagnet
-       , simpleMagnet
-       , detailedMagnet
-
-         -- ** Conversion
-       , parseMagnet
-       , renderMagnet
-
-         -- * URN
-       , URN (..)
-
-         -- ** Namespaces
-       , NamespaceId
-       , btih
-
-         -- ** Construction
-       , infohashURN
-
-         -- ** Conversion
-       , parseURN
-       , renderURN
-       ) where
-
-import Control.Applicative
-import Control.Monad
-import Data.ByteString.Char8 as BC
-import Data.Convertible
-import Data.Default
-import Data.Map as M
-import Data.Maybe
-import Data.List as L
-import Data.String
-import Data.Text as T
-import Data.Text.Encoding as T
-import Data.Text.Read
-import Data.Typeable
-import Network.HTTP.Types.QueryLike
-import Network.HTTP.Types.URI
-import Network.URI
-import Text.PrettyPrint as PP
-import Text.PrettyPrint.Class
-
-import Data.Torrent
-import Data.Torrent.InfoHash
-import Data.Torrent.Layout
-
-
--- | Namespace identifier determines the syntactic interpretation of
--- namespace-specific string.
-type NamespaceId = [Text]
-
--- | BitTorrent Info Hash (hence the name) namespace
--- identifier. Namespace-specific string /should/ be a base16\/base32
--- encoded SHA1 hash of the corresponding torrent /info/ dictionary.
---
-btih :: NamespaceId
-btih  = ["btih"]
-
--- | URN is pesistent location-independent identifier for
---   resources. In particular, URNs are used represent torrent names
---   as a part of magnet link, see 'Data.Torrent.Magnet.Magnet' for
---   more info.
---
-data URN = URN
-  { urnNamespace :: NamespaceId -- ^ a namespace identifier;
-  , urnString    :: Text        -- ^ a corresponding
-                                -- namespace-specific string.
-  } deriving (Eq, Ord, Typeable)
-
-{-----------------------------------------------------------------------
---  URN to infohash convertion
------------------------------------------------------------------------}
-
-instance Convertible URN InfoHash where
-  safeConvert u @ URN {..}
-    | urnNamespace /= btih = convError "invalid namespace" u
-    |       otherwise      = safeConvert urnString
-
--- | Make resource name for torrent with corresponding
--- infohash. Infohash is base16 (hex) encoded.
---
-infohashURN :: InfoHash -> URN
-infohashURN = URN btih . longHex
-
--- | Meaningless placeholder value.
-instance Default URN where
-  def = infohashURN def
-
-{-----------------------------------------------------------------------
---  URN Rendering
------------------------------------------------------------------------}
-
--- | Render URN to its text representation.
-renderURN :: URN -> Text
-renderURN URN {..}
-  = T.intercalate ":" $ "urn" : urnNamespace ++ [urnString]
-
-instance Pretty URN where
-  pretty = text . T.unpack . renderURN
-
-instance Show URN where
-  showsPrec n = showsPrec n . T.unpack . renderURN
-
-instance QueryValueLike URN where
-  toQueryValue = toQueryValue . renderURN
-  {-# INLINE toQueryValue #-}
-
-{-----------------------------------------------------------------------
---  URN Parsing
------------------------------------------------------------------------}
-
-unsnoc :: [a] -> Maybe ([a], a)
-unsnoc [] = Nothing
-unsnoc xs = Just (L.init xs, L.last xs)
-
-instance Convertible Text URN where
-  safeConvert t = case T.split (== ':') t of
-    uriScheme : body
-      | T.toLower uriScheme == "urn" ->
-        case unsnoc body of
-          Just (namespace, val) -> pure URN
-            { urnNamespace = namespace
-            , urnString    = val
-            }
-          Nothing -> convError "missing URN string" body
-      | otherwise -> convError "invalid URN scheme" uriScheme
-    []            -> convError "missing URN scheme" t
-
-instance IsString URN where
-  fromString = either (error . prettyConvertError) id
-             . safeConvert . T.pack
-
--- | Try to parse an URN from its text representation.
---
---  Use 'safeConvert' for detailed error messages.
---
-parseURN :: Text -> Maybe URN
-parseURN = either (const Nothing) pure . safeConvert
-
-{-----------------------------------------------------------------------
---  Magnet
------------------------------------------------------------------------}
-
--- TODO multiple exact topics
--- TODO render/parse supplement for URI/query
-
--- | An URI used to identify torrent.
-data Magnet = Magnet
-  { -- | Torrent infohash hash. Can be used in DHT queries if no
-    -- 'tracker' provided.
-    exactTopic  :: !InfoHash -- TODO InfoHash -> URN?
-
-    -- | A filename for the file to download. Can be used to
-    -- display name while waiting for metadata.
-  , displayName :: Maybe Text
-
-    -- | Size of the resource in bytes.
-  , exactLength :: Maybe Integer
-
-    -- | URI pointing to manifest, e.g. a list of further items.
-  , manifest :: Maybe Text
-
-    -- | Search string.
-  , keywordTopic :: Maybe Text
-
-    -- | A source to be queried after not being able to find and
-    -- download the file in the bittorrent network in a defined
-    -- amount of time.
-  , acceptableSource :: Maybe URI
-
-    -- | Direct link to the resource.
-  , exactSource      :: Maybe URI
-
-    -- | URI to the tracker.
-  , tracker :: Maybe URI
-
-    -- | Additional or experimental parameters.
-  , supplement :: Map Text Text
-  } deriving (Eq, Ord, Typeable)
-
-instance QueryValueLike Integer where
-  toQueryValue = toQueryValue . show
-
-instance QueryValueLike URI where
-  toQueryValue = toQueryValue . show
-
-instance QueryLike Magnet where
-  toQuery Magnet {..} =
-    [ ("xt", toQueryValue $ infohashURN exactTopic)
-    , ("dn", toQueryValue displayName)
-    , ("xl", toQueryValue exactLength)
-    , ("mt", toQueryValue manifest)
-    , ("kt", toQueryValue keywordTopic)
-    , ("as", toQueryValue acceptableSource)
-    , ("xs", toQueryValue exactSource)
-    , ("tr", toQueryValue tracker)
-    ]
-
-instance QueryValueLike Magnet where
-  toQueryValue = toQueryValue . renderMagnet
-
-instance Convertible QueryText Magnet where
-  safeConvert xs = do
-      urnStr   <- getTextMsg "xt" "exact topic not defined" xs
-      infoHash <- convertVia (error "safeConvert" :: URN)  urnStr
-      return Magnet
-        { exactTopic       = infoHash
-        , displayName      = getText "dn" xs
-        , exactLength      = getText "xl" xs >>= getInt
-        , manifest         = getText "mt" xs
-        , keywordTopic     = getText "kt" xs
-        , acceptableSource = getText "as" xs >>= getURI
-        , exactSource      = getText "xs" xs >>= getURI
-        , tracker          = getText "tr" xs >>= getURI
-        , supplement       = M.empty
-        }
-    where
-      getInt    = either (const Nothing) (Just . fst) . signed decimal
-      getURI    = parseURI . T.unpack
-      getText p = join . L.lookup p
-      getTextMsg p msg ps = maybe (convError msg xs) pure $ getText p ps
-
-magnetScheme :: URI
-magnetScheme = URI
-    { uriScheme    = "magnet:"
-    , uriAuthority = Nothing
-    , uriPath      = ""
-    , uriQuery     = ""
-    , uriFragment  = ""
-    }
-
-isMagnetURI :: URI -> Bool
-isMagnetURI u = u { uriQuery = "" } == magnetScheme
-
--- | Can be used instead of 'parseMagnet'.
-instance Convertible URI Magnet where
-  safeConvert u @ URI {..}
-    | not (isMagnetURI u) = convError "this is not a magnet link" u
-    |      otherwise      = safeConvert $ parseQueryText $ BC.pack uriQuery
-
--- | Can be used instead of 'renderMagnet'.
-instance Convertible Magnet URI where
-  safeConvert m = pure $ magnetScheme
-    { uriQuery = BC.unpack $ renderQuery True $ toQuery m }
-
-instance Convertible String Magnet where
-  safeConvert str
-    | Just uri <- parseURI str = safeConvert uri
-    |        otherwise         = convError "unable to parse uri" str
-
-{-----------------------------------------------------------------------
---  Magnet Construction
------------------------------------------------------------------------}
-
--- | Meaningless placeholder value.
-instance Default Magnet where
-  def = Magnet
-    { exactTopic       = def
-    , displayName      = Nothing
-    , exactLength      = Nothing
-    , manifest         = Nothing
-    , keywordTopic     = Nothing
-    , acceptableSource = Nothing
-    , exactSource      = Nothing
-    , tracker          = Nothing
-    , supplement       = M.empty
-    }
-
--- | Set 'exactTopic' ('xt' param) only, other params are empty.
-nullMagnet :: InfoHash -> Magnet
-nullMagnet u = Magnet
-    { exactTopic   = u
-    , displayName  = Nothing
-    , exactLength  = Nothing
-    , manifest     = Nothing
-    , keywordTopic = Nothing
-    , acceptableSource = Nothing
-    , exactSource      = Nothing
-    , tracker    = Nothing
-    , supplement = M.empty
-    }
-
--- | Like 'nullMagnet' but also include 'displayName' ('dn' param).
-simpleMagnet :: Torrent -> Magnet
-simpleMagnet Torrent {tInfoDict = InfoDict {..}}
-  = (nullMagnet idInfoHash)
-    { displayName = Just $ T.decodeUtf8 $ suggestedName idLayoutInfo
-    }
-
--- | Like 'simpleMagnet' but also include 'exactLength' ('xl' param) and
--- 'tracker' ('tr' param).
---
-detailedMagnet :: Torrent -> Magnet
-detailedMagnet t @ Torrent {tInfoDict = InfoDict {..}, tAnnounce}
-  = (simpleMagnet t)
-    { exactLength = Just $ fromIntegral $ contentLength idLayoutInfo
-    , tracker     = tAnnounce
-    }
-
-{-----------------------------------------------------------------------
---  Magnet Conversion
------------------------------------------------------------------------}
-
-parseMagnetStr :: String -> Maybe Magnet
-parseMagnetStr = either (const Nothing) Just . safeConvert
-
-renderMagnetStr :: Magnet -> String
-renderMagnetStr = show . (convert :: Magnet -> URI)
-
-instance Pretty Magnet where
-  pretty = PP.text . renderMagnetStr
-
-instance Show Magnet where
-  show = renderMagnetStr
-  {-# INLINE show #-}
-
-instance Read Magnet where
-  readsPrec _ xs
-      | Just m <- parseMagnetStr mstr = [(m, rest)]
-      | otherwise = []
-    where
-      (mstr, rest) = L.break (== ' ') xs
-
-instance IsString Magnet where
-  fromString str = fromMaybe (error msg) $ parseMagnetStr str
-    where
-      msg = "unable to parse magnet: " ++ str
-
--- | Try to parse magnet link from urlencoded string. Use
--- 'safeConvert' to find out error location.
---
-parseMagnet :: Text -> Maybe Magnet
-parseMagnet = parseMagnetStr . T.unpack
-{-# INLINE parseMagnet #-}
-
--- | Render magnet link to urlencoded string
-renderMagnet :: Magnet -> Text
-renderMagnet = T.pack . renderMagnetStr
-{-# INLINE renderMagnet #-}
diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index bcc7cfcf..91a58887 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -57,7 +57,5 @@ module Network.BitTorrent
        ) where
 
 import Data.Torrent
-import Data.Torrent.InfoHash
-import Data.Torrent.Magnet
 import Network.BitTorrent.Client
 import Network.BitTorrent.Internal.Types
\ No newline at end of file
diff --git a/src/Network/BitTorrent/Client.hs b/src/Network/BitTorrent/Client.hs
index bf6740c3..700289d2 100644
--- a/src/Network/BitTorrent/Client.hs
+++ b/src/Network/BitTorrent/Client.hs
@@ -61,8 +61,6 @@ import Data.Text
 import Network
 
 import           Data.Torrent
-import           Data.Torrent.InfoHash
-import           Data.Torrent.Magnet
 import           Network.BitTorrent.Client.Types
 import           Network.BitTorrent.Client.Handle
 import           Network.BitTorrent.Core
diff --git a/src/Network/BitTorrent/Client/Handle.hs b/src/Network/BitTorrent/Client/Handle.hs
index 0d1b7f92..66baac48 100644
--- a/src/Network/BitTorrent/Client/Handle.hs
+++ b/src/Network/BitTorrent/Client/Handle.hs
@@ -26,8 +26,6 @@ import Data.List as L
 import Data.HashMap.Strict as HM
 
 import Data.Torrent
-import Data.Torrent.InfoHash
-import Data.Torrent.Magnet
 import Network.BitTorrent.Client.Types as Types
 import Network.BitTorrent.DHT      as DHT
 import Network.BitTorrent.Exchange as Exchange
diff --git a/src/Network/BitTorrent/Client/Types.hs b/src/Network/BitTorrent/Client/Types.hs
index c019bc5f..3c1e9c9c 100644
--- a/src/Network/BitTorrent/Client/Types.hs
+++ b/src/Network/BitTorrent/Client/Types.hs
@@ -34,7 +34,7 @@ import Data.Ord
 import Network
 import System.Log.FastLogger
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.Internal.Types as Types
 import Network.BitTorrent.Core
 import Network.BitTorrent.DHT      as DHT
diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs
index f587f7c8..b6067456 100644
--- a/src/Network/BitTorrent/DHT.hs
+++ b/src/Network/BitTorrent/DHT.hs
@@ -62,8 +62,7 @@ import Data.Conduit as C
 import Data.Conduit.List as C
 import Network.Socket
 
-import Data.Torrent (tNodes)
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.Core
 import Network.BitTorrent.DHT.Query
 import Network.BitTorrent.DHT.Session
diff --git a/src/Network/BitTorrent/DHT/ContactInfo.hs b/src/Network/BitTorrent/DHT/ContactInfo.hs
index 2aedf900..201b84ee 100644
--- a/src/Network/BitTorrent/DHT/ContactInfo.hs
+++ b/src/Network/BitTorrent/DHT/ContactInfo.hs
@@ -11,7 +11,7 @@ import Data.Monoid
 import Data.HashMap.Strict as HM
 import Data.Serialize
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.Core.PeerAddr
 
 {-
diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index 7bcd00f0..06274fa7 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -92,7 +92,7 @@ import Data.Typeable
 import Network
 import Network.KRPC
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.Core
 import Network.BitTorrent.DHT.Token
 import Network.KRPC ()
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 48dfc15a..497c9001 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -56,7 +56,7 @@ import Text.PrettyPrint as PP hiding ((<>), ($$))
 import Text.PrettyPrint.Class
 
 import Network.KRPC hiding (Options, def)
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.Core
 import Network.BitTorrent.DHT.Message
 import Network.BitTorrent.DHT.Routing
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/BitTorrent/DHT/Routing.hs
index 106aec31..5dc511bd 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/BitTorrent/DHT/Routing.hs
@@ -73,7 +73,7 @@ import GHC.Generics
 import Text.PrettyPrint as PP hiding ((<>))
 import Text.PrettyPrint.Class
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.Core
 
 {-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index 7df25739..87a6d4ea 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -91,7 +91,7 @@ import System.Random (randomIO)
 import Text.PrettyPrint as PP hiding ((<>), ($$))
 import Text.PrettyPrint.Class
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.KRPC hiding (Options, def)
 import qualified Network.KRPC as KRPC (def)
 import Network.BitTorrent.Core
diff --git a/src/Network/BitTorrent/Exchange/Connection.hs b/src/Network/BitTorrent/Exchange/Connection.hs
index fd9022da..42b991a0 100644
--- a/src/Network/BitTorrent/Exchange/Connection.hs
+++ b/src/Network/BitTorrent/Exchange/Connection.hs
@@ -136,7 +136,7 @@ import System.Log.FastLogger (ToLogStr(..))
 import System.Timeout
 
 import Data.Torrent.Bitfield as BF
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.Core
 import Network.BitTorrent.Exchange.Message as Msg
 
diff --git a/src/Network/BitTorrent/Exchange/Manager.hs b/src/Network/BitTorrent/Exchange/Manager.hs
index b9aaa818..ad7a47a2 100644
--- a/src/Network/BitTorrent/Exchange/Manager.hs
+++ b/src/Network/BitTorrent/Exchange/Manager.hs
@@ -12,7 +12,7 @@ import Control.Monad
 import Data.Default
 import Network.Socket
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.Core
 import Network.BitTorrent.Exchange.Connection hiding (Options)
 import Network.BitTorrent.Exchange.Session
diff --git a/src/Network/BitTorrent/Exchange/Message.hs b/src/Network/BitTorrent/Exchange/Message.hs
index d8873f95..bd5c6526 100644
--- a/src/Network/BitTorrent/Exchange/Message.hs
+++ b/src/Network/BitTorrent/Exchange/Message.hs
@@ -118,7 +118,7 @@ import Text.PrettyPrint as PP hiding ((<>))
 import Text.PrettyPrint.Class
 
 import Data.Torrent.Bitfield
-import Data.Torrent.InfoHash
+import Data.Torrent
 import qualified Data.Torrent.Piece as P
 import Network.BitTorrent.Core
 import Network.BitTorrent.Exchange.Block
diff --git a/src/Network/BitTorrent/Exchange/Session.hs b/src/Network/BitTorrent/Exchange/Session.hs
index 6f480ce4..0adb08c8 100644
--- a/src/Network/BitTorrent/Exchange/Session.hs
+++ b/src/Network/BitTorrent/Exchange/Session.hs
@@ -45,11 +45,9 @@ import Text.PrettyPrint.Class
 import System.Log.FastLogger (LogStr, ToLogStr (..))
 
 import Data.BEncode as BE
-import Data.Torrent (InfoDict (..))
+import Data.Torrent as T
+import Data.Torrent.Piece as Torrent
 import Data.Torrent.Bitfield as BF
-import Data.Torrent.InfoHash
-import Data.Torrent.Piece
-import qualified Data.Torrent.Piece as Torrent (Piece ())
 import Network.BitTorrent.Internal.Types
 import Network.BitTorrent.Core
 import Network.BitTorrent.Exchange.Block   as Block
diff --git a/src/Network/BitTorrent/Exchange/Session/Metadata.hs b/src/Network/BitTorrent/Exchange/Session/Metadata.hs
index 79156e2e..bdd5b322 100644
--- a/src/Network/BitTorrent/Exchange/Session/Metadata.hs
+++ b/src/Network/BitTorrent/Exchange/Session/Metadata.hs
@@ -26,8 +26,7 @@ import Data.List as L
 import Data.Tuple
 
 import Data.BEncode as BE
-import Data.Torrent
-import Data.Torrent.InfoHash
+import Data.Torrent as Torrent
 import Data.Torrent.Piece as Torrent
 import Network.BitTorrent.Core
 import Network.BitTorrent.Exchange.Block   as Block
diff --git a/src/Network/BitTorrent/Tracker/Message.hs b/src/Network/BitTorrent/Tracker/Message.hs
index cdc07af8..e58f6d70 100644
--- a/src/Network/BitTorrent/Tracker/Message.hs
+++ b/src/Network/BitTorrent/Tracker/Message.hs
@@ -124,7 +124,7 @@ import Numeric
 import System.Entropy
 import Text.Read (readMaybe)
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Data.Torrent.Progress
 import Network.BitTorrent.Core
 
diff --git a/src/Network/BitTorrent/Tracker/RPC.hs b/src/Network/BitTorrent/Tracker/RPC.hs
index dc1bd4ec..9148f1f5 100644
--- a/src/Network/BitTorrent/Tracker/RPC.hs
+++ b/src/Network/BitTorrent/Tracker/RPC.hs
@@ -25,7 +25,7 @@ module Network.BitTorrent.Tracker.RPC
          -- * RPC
        , SAnnounceQuery (..)
        , RpcException (..)
-       , announce
+       , Network.BitTorrent.Tracker.RPC.announce
        , scrape
        ) where
 
@@ -36,7 +36,7 @@ import Network
 import Network.URI
 import Network.Socket (HostAddress)
 
-import           Data.Torrent.InfoHash
+import           Data.Torrent
 import           Data.Torrent.Progress
 import           Network.BitTorrent.Core
 import           Network.BitTorrent.Tracker.Message
diff --git a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
index 4a8e5f79..b4924e6d 100644
--- a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
+++ b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
@@ -47,7 +47,7 @@ import qualified Network.HTTP.Conduit as HTTP
 import           Network.HTTP.Types.Header (hUserAgent)
 import           Network.HTTP.Types.URI    (SimpleQuery, renderSimpleQuery)
 
-import Data.Torrent.InfoHash               (InfoHash)
+import Data.Torrent                        (InfoHash)
 import Network.BitTorrent.Core.Fingerprint (libUserAgent)
 import Network.BitTorrent.Tracker.Message hiding (Request, Response)
 
diff --git a/src/Network/BitTorrent/Tracker/Session.hs b/src/Network/BitTorrent/Tracker/Session.hs
index 560acf84..35db459f 100644
--- a/src/Network/BitTorrent/Tracker/Session.hs
+++ b/src/Network/BitTorrent/Tracker/Session.hs
@@ -57,7 +57,7 @@ import Data.Time
 import Data.Traversable
 import Network.URI
 
-import Data.Torrent.InfoHash
+import Data.Torrent
 import Network.BitTorrent.Core
 import Network.BitTorrent.Internal.Cache
 import Network.BitTorrent.Internal.Types