2 files changed, 16 insertions, 4 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 211eee06..5f39d3ea 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -74,6 +74,8 @@ library
                      , binary-conduit
 
                        -- Data
+                     , data-default
+
                      , array       >= 0.4
                      , bytestring  >= 0.10.0.0
 
@@ -105,9 +107,11 @@ library
                      , directory   >= 1
                      , mmap        >= 0.5.2
 
-                       -- Misc
-                     , data-default
+                       -- Hash
                      , cryptohash
+                     , hashable
+
+                       -- Misc
                      , pretty
 
 --                     , bits-atomic >= 0.1
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index bdd38630..8e6f9088 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -50,7 +50,8 @@ module Data.Torrent
 
 #if defined (TESTING)
          -- * Internal
-       , hash, hashlazy
+       , Data.Torrent.hash
+       , Data.Torrent.hashlazy
 #endif
        ) where
 
@@ -71,6 +72,7 @@ import qualified Data.ByteString.Lazy as Lazy
 import qualified Data.ByteString.Lazy.Builder as B
 import qualified Data.ByteString.Lazy.Builder.ASCII as B
 import qualified Data.List as L
+import           Data.Hashable as Hashable
 import           Data.Text (Text)
 import           Data.Serialize as S hiding (Result)
 import           Text.PrettyPrint
@@ -127,6 +129,9 @@ data Torrent = Torrent {
       --   the encrypted SHA-1 hash of the info dictionary).
     } deriving (Show, Eq)
 
+instance Hashable Torrent where
+  hash = Hashable.hash . tInfoHash
+
 {- note that info hash is actually reduntant field
    but it's better to keep it here to avoid heavy recomputations
 -}
@@ -377,7 +382,7 @@ checkPiece :: ContentInfo -> Int -> ByteString -> Bool
 checkPiece ci ix piece @ (PS _ off si)
   | traceShow (ix, off, si) True
   =  B.length piece == ciPieceLength ci
-  && hash piece     == InfoHash (pieceHash ci ix)
+  && C.hash   piece == pieceHash ci ix
 
 -- | Read and decode a .torrent file.
 fromFile :: FilePath -> IO Torrent
@@ -395,6 +400,9 @@ fromFile filepath = do
 newtype InfoHash = InfoHash { getInfoHash :: ByteString }
                    deriving (Eq, Ord)
 
+instance Hashable InfoHash where
+  hash = Hashable.hash . getInfoHash
+
 instance BEncodable InfoHash where
   toBEncode = toBEncode . getInfoHash
   fromBEncode be = InfoHash <$> fromBEncode be