Hide InfoHash internal functions

3 files changed, 15 insertions, 16 deletions

diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index 8411dc97..e4b17c2b 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -66,6 +66,7 @@ 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
@@ -79,6 +80,7 @@ import qualified Data.ByteString.Lazy  as BL
 import           Data.Char as Char
 import           Data.Hashable   as Hashable
 import qualified Data.List as L
+import           Data.Maybe
 import           Data.Text as T
 import Data.Time
 import Data.Time.Clock.POSIX
@@ -141,7 +143,7 @@ instance Hashable InfoDict where
 infoDictionary :: LayoutInfo -> PieceInfo -> Bool -> InfoDict
 infoDictionary li pinfo private = InfoDict ih li pinfo private
   where
-    ih = IH.hashlazy $ encode $ InfoDict fake_ih li pinfo private
+    ih = hashLazyIH $ encode $ InfoDict fake_ih li pinfo private
     fake_ih = "0123456789012345678901234567890123456789"
 
 getPrivate :: Get Bool
@@ -151,6 +153,12 @@ putPrivate :: Bool -> BDict -> BDict
 putPrivate False = id
 putPrivate True  = \ cont -> "private" .=! True .: cont
 
+-- | Hash lazy bytestring using SHA1 algorithm.
+hashLazyIH :: BL.ByteString -> InfoHash
+hashLazyIH = fromMaybe (error msg) . byteStringToInfoHash . C.hashlazy
+  where
+    msg = "Infohash.hash: impossible: SHA1 is always 20 bytes long"
+
 instance BEncode InfoDict where
   toBEncode InfoDict {..} = toDict $
       putLayoutInfo idLayoutInfo   $
@@ -163,7 +171,7 @@ instance BEncode InfoDict where
                   <*> getPieceInfo
                   <*> getPrivate
     where
-      ih = IH.hashlazy (encode dict)
+      ih = hashLazyIH (encode dict)
 
 ppPrivacy :: Bool -> Doc
 ppPrivacy privacy = "Privacy: " <> if privacy then "private" else "public"
diff --git a/src/Data/Torrent/InfoHash.hs b/src/Data/Torrent/InfoHash.hs
index fd57700a..e9e6cf39 100644
--- a/src/Data/Torrent/InfoHash.hs
+++ b/src/Data/Torrent/InfoHash.hs
@@ -21,15 +21,10 @@ module Data.Torrent.InfoHash
        , shortHex
 
        , addHashToURI
-
-         -- * Internal
-       , Data.Torrent.InfoHash.hash
-       , Data.Torrent.InfoHash.hashlazy
        ) where
 
 import Control.Applicative
 import Control.Monad
-import qualified Crypto.Hash.SHA1 as C
 import Data.Aeson
 import Data.BEncode
 import Data.ByteString as BS
@@ -151,14 +146,6 @@ shortHex = T.take 7 . longHex
 ppHex :: BS.ByteString -> BS.ByteString
 ppHex = BL.toStrict . B.toLazyByteString . B.byteStringHexFixed
 
--- | Hash strict bytestring using SHA1 algorithm.
-hash :: BS.ByteString -> InfoHash
-hash = InfoHash . C.hash
-
--- | Hash lazy bytestring using SHA1 algorithm.
-hashlazy :: BL.ByteString -> InfoHash
-hashlazy = InfoHash . C.hashlazy
-
 -- | Add query info hash parameter to uri.
 --
 --   > info_hash=<url_encoded_info_hash>
diff --git a/tests/Data/Torrent/InfoHashSpec.hs b/tests/Data/Torrent/InfoHashSpec.hs
index ba9ce9a4..afa017ef 100644
--- a/tests/Data/Torrent/InfoHashSpec.hs
+++ b/tests/Data/Torrent/InfoHashSpec.hs
@@ -2,6 +2,8 @@
 module Data.Torrent.InfoHashSpec (spec) where
 
 import Control.Applicative
+import Data.ByteString as BS
+import Data.Maybe
 import System.FilePath
 import Test.Hspec
 import Test.QuickCheck
@@ -12,7 +14,9 @@ import Data.Torrent.InfoHash as IH
 
 
 instance Arbitrary InfoHash where
-  arbitrary = IH.hash <$> arbitrary
+  arbitrary = do
+    bs <- BS.pack <$> vectorOf 20 arbitrary
+    pure $ fromMaybe (error "arbitrary infohash") $ byteStringToInfoHash bs
 
 type TestPair = (FilePath, String)