5 files changed, 10 insertions, 11 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index f1a04329..d653c971 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -160,6 +160,7 @@ test-suite spec
                      , directory
                      , filepath
                      , time
+                     , convertible
 
                      , aeson
                      , cereal
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index d6227b6f..b3ac7586 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -78,10 +78,10 @@ import           Data.ByteString as BS
 import qualified Data.ByteString.Char8 as BC (pack, unpack)
 import qualified Data.ByteString.Lazy  as BL
 import           Data.Char as Char
+import           Data.Convertible
 import           Data.Default
 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
@@ -155,7 +155,7 @@ putPrivate True  = \ cont -> "private" .=! True .: cont
 
 -- | Hash lazy bytestring using SHA1 algorithm.
 hashLazyIH :: BL.ByteString -> InfoHash
-hashLazyIH = fromMaybe (error msg) . byteStringToInfoHash . C.hashlazy
+hashLazyIH = either (const (error msg)) id . safeConvert . C.hashlazy
   where
     msg = "Infohash.hash: impossible: SHA1 is always 20 bytes long"
 
diff --git a/src/Data/Torrent/InfoHash.hs b/src/Data/Torrent/InfoHash.hs
index 7442c61c..08cee3c9 100644
--- a/src/Data/Torrent/InfoHash.hs
+++ b/src/Data/Torrent/InfoHash.hs
@@ -15,7 +15,6 @@ module Data.Torrent.InfoHash
        ( InfoHash
 
          -- * Parsing
-       , byteStringToInfoHash
        , textToInfoHash
 
          -- * Rendering
@@ -163,12 +162,9 @@ instance FromJSON InfoHash where
 ignoreErrorMsg :: Either a b -> Maybe b
 ignoreErrorMsg = either (const Nothing) Just
 
--- | TODO remove from API
-byteStringToInfoHash :: BS.ByteString -> Maybe InfoHash
-byteStringToInfoHash = ignoreErrorMsg . safeConvert
-
--- | Tries both base16 and base32 while decoding info hash. To Use
--- 'safeConvert' to find out
+-- | Tries both base16 and base32 while decoding info hash.
+--
+--  Use 'safeConvert' for detailed error messages.
 --
 textToInfoHash :: Text -> Maybe InfoHash
 textToInfoHash = ignoreErrorMsg . safeConvert
diff --git a/src/Network/BitTorrent/Tracker/Message.hs b/src/Network/BitTorrent/Tracker/Message.hs
index e5d8b25a..3437dcf3 100644
--- a/src/Network/BitTorrent/Tracker/Message.hs
+++ b/src/Network/BitTorrent/Tracker/Message.hs
@@ -55,6 +55,7 @@ import Data.BEncode.BDict as BE
 import Data.ByteString as BS
 import Data.ByteString.Char8 as BC
 import Data.Char as Char
+import Data.Convertible
 import Data.List as L
 import Data.Map  as M
 import Data.Maybe
@@ -265,7 +266,7 @@ class FromParam a where
   fromParam :: BS.ByteString -> Maybe a
 
 instance FromParam InfoHash where
-  fromParam = byteStringToInfoHash
+  fromParam = either (const Nothing) pure . safeConvert
 
 instance FromParam PeerId where
   fromParam = byteStringToPeerId
diff --git a/tests/Data/Torrent/InfoHashSpec.hs b/tests/Data/Torrent/InfoHashSpec.hs
index afa017ef..3cc110c1 100644
--- a/tests/Data/Torrent/InfoHashSpec.hs
+++ b/tests/Data/Torrent/InfoHashSpec.hs
@@ -3,6 +3,7 @@ module Data.Torrent.InfoHashSpec (spec) where
 
 import Control.Applicative
 import Data.ByteString as BS
+import Data.Convertible
 import Data.Maybe
 import System.FilePath
 import Test.Hspec
@@ -16,7 +17,7 @@ import Data.Torrent.InfoHash as IH
 instance Arbitrary InfoHash where
   arbitrary = do
     bs <- BS.pack <$> vectorOf 20 arbitrary
-    pure $ fromMaybe (error "arbitrary infohash") $ byteStringToInfoHash bs
+    pure $ either (const (error "arbitrary infohash")) id $ safeConvert bs
 
 type TestPair = (FilePath, String)