2 files changed, 8 insertions, 31 deletions

diff --git a/src/Data/Torrent/Block.hs b/src/Data/Torrent/Block.hs
index 987de653..37889a7a 100644
--- a/src/Data/Torrent/Block.hs
+++ b/src/Data/Torrent/Block.hs
@@ -37,9 +37,6 @@ import Data.Aeson.TH
 import qualified Data.ByteString.Lazy as Lazy
 import Data.Char
 import Data.List as L
-import Data.Binary as B
-import Data.Binary.Get as B
-import Data.Binary.Put as B
 import Data.Serialize as S
 import Text.PrettyPrint
 import Text.PrettyPrint.Class
@@ -110,14 +107,6 @@ putInt :: S.Putter Int
 putInt = S.putWord32be . fromIntegral
 {-# INLINE putInt #-}
 
-getIntB :: B.Get Int
-getIntB = fromIntegral <$> B.getWord32be
-{-# INLINE getIntB #-}
-
-putIntB :: Int -> B.Put
-putIntB = B.putWord32be . fromIntegral
-{-# INLINE putIntB #-}
-
 instance Serialize BlockIx where
   {-# SPECIALIZE instance Serialize BlockIx #-}
   get = BlockIx <$> getInt
@@ -131,18 +120,6 @@ instance Serialize BlockIx where
     putInt ixLength
   {-# INLINE put #-}
 
-instance Binary BlockIx where
-  {-# SPECIALIZE instance Binary BlockIx #-}
-  get = BlockIx <$> getIntB
-                <*> getIntB
-                <*> getIntB
-  {-# INLINE get #-}
-
-  put BlockIx {..} = do
-    putIntB ixPiece
-    putIntB ixOffset
-    putIntB ixLength
-
 instance Pretty BlockIx where
   pretty BlockIx {..} =
     "piece  = " <> int ixPiece  <> "," <+>
diff --git a/src/Data/Torrent/InfoHash.hs b/src/Data/Torrent/InfoHash.hs
index 6313948b..15682250 100644
--- a/src/Data/Torrent/InfoHash.hs
+++ b/src/Data/Torrent/InfoHash.hs
@@ -125,21 +125,21 @@ instance Convertible BS.ByteString InfoHash where
 -- | Parse infohash from base16\/base32\/base64 encoded string.
 instance Convertible Text InfoHash where
   safeConvert t
-      |      hashLen <= 28   =
+      | 26 <= hashLen && hashLen <= 28 =
         case Base64.decode hashStr of
           Left  msg   -> convError ("invalid base64 encoding " ++ msg) t
-          Right ihStr -> pure $ InfoHash ihStr
+          Right ihStr -> safeConvert ihStr
 
       |      hashLen == 32   =
         case Base32.decode hashStr of
           Left  msg   -> convError msg t
-          Right ihStr -> pure $ InfoHash ihStr
+          Right ihStr -> safeConvert ihStr
 
       |      hashLen == 40   =
         let (ihStr, inv) = Base16.decode hashStr
-        in if BS.length inv == 0
-           then pure $ InfoHash ihStr
-           else convError "invalid base16 encoding" t
+        in if BS.length inv /= 0
+           then convError "invalid base16 encoding" t
+           else safeConvert ihStr
 
       |        otherwise     = convError "invalid length" t
     where
@@ -156,8 +156,8 @@ instance ToJSON InfoHash where
 
 -- | Convert from base16\/base32\/base64 encoded JSON string.
 instance FromJSON InfoHash where
-  parseJSON = withText "JSON" $ -- TODO
-    maybe (fail "could not parse InfoHash") pure . textToInfoHash
+  parseJSON = withText "InfoHash" $
+    either (fail . prettyConvertError) pure . safeConvert
 
 ignoreErrorMsg :: Either a b -> Maybe b
 ignoreErrorMsg = either (const Nothing) Just