fix(bloomfilter): add salt to tests

Author: wenkokke

bloomfilter/tests/bloomfilter-tests.hs

@@ -3,7 +3,7 @@ module Main (main) where
 import qualified Data.BloomFilter.Blocked as Bloom.Blocked
 import qualified Data.BloomFilter.Classic as B
 import qualified Data.BloomFilter.Classic as Bloom.Classic
-import           Data.BloomFilter.Hash (Hashable (..), hash64)
+import           Data.BloomFilter.Hash (Hashable (..))
 
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as BS
@@ -90,6 +90,9 @@ tests =
         , testProperty "prop_list_ex" $
           hash64 [[],[],[BS.empty]] =/= hash64 [[],[BS.empty],[]]
         ]
+      where
+        hash64 :: (Hashable a) => a -> Word64
+        hash64 = hashSalt64 0
 
 proxyClassic :: Proxy Bloom.Classic.Bloom
 proxyClassic = Proxy
@@ -103,10 +106,10 @@ proxyBlocked = Proxy
 
 prop_elem :: forall bloom a. (BloomFilter bloom, Hashable a)
           => Proxy bloom -> Proxy a
-          -> a -> [a] -> FPR -> Property
-prop_elem proxy _ x xs (FPR q) =
+          -> B.Salt -> a -> [a] -> FPR -> Property
+prop_elem proxy _ salt x xs (FPR q) =
     let bf :: bloom a
-        bf = fromList (policyForFPR proxy q) (x:xs)
+        bf = fromList salt (policyForFPR proxy q) (x:xs)
      in elem x bf .&&. not (notElem x bf)
 
 -------------------------------------------------------------------------------
@@ -245,7 +248,9 @@ prop_rechunked f s =
         in n > 0 ==> f s === f (rechunk n s)
 
 prop_rechunked_eq :: LBS.ByteString -> Property
-prop_rechunked_eq = prop_rechunked hash64
+prop_rechunked_eq = prop_rechunked (hashSalt64 salt)
+  where
+    salt = 0
 
 -------------------------------------------------------------------------------
 -- Bulk operations
@@ -256,12 +261,14 @@ prop_insertMany :: FPR -> [Word64] -> Property
 prop_insertMany (FPR fpr) keys =
      bloom_insert === bloom_insertMany
   where
+    bloom_salt = 4
+
     bloom_insert =
-      Bloom.Blocked.create (Bloom.Blocked.sizeForFPR fpr n) $ \mb ->
+      Bloom.Blocked.create bloom_salt (Bloom.Blocked.sizeForFPR fpr n) $ \mb ->
         mapM_ (Bloom.Blocked.insert mb) keys
 
     bloom_insertMany =
-      Bloom.Blocked.create (Bloom.Blocked.sizeForFPR fpr n) $ \mb ->
+      Bloom.Blocked.create bloom_salt (Bloom.Blocked.sizeForFPR fpr n) $ \mb ->
         Bloom.Blocked.insertMany mb (\k -> pure $ keys !! k) n
 
     !n = length keys
@@ -271,7 +278,7 @@ prop_insertMany (FPR fpr) keys =
 -------------------------------------------------------------------------------
 
 class BloomFilter bloom where
-  fromList :: Hashable a => B.BloomPolicy -> [a] -> bloom a
+  fromList :: Hashable a => B.Salt -> B.BloomPolicy -> [a] -> bloom a
   elem     :: Hashable a => a -> bloom a -> Bool
   notElem  :: Hashable a => a -> bloom a -> Bool