]> git.immae.eu Git - github/fretlink/hmacaroons.git/commitdiff
Update QuickCheck
authorJulien Tanguy <julien.tanguy@jhome.fr>
Wed, 17 Jun 2015 15:51:29 +0000 (17:51 +0200)
committerJulien Tanguy <julien.tanguy@jhome.fr>
Wed, 17 Jun 2015 15:51:29 +0000 (17:51 +0200)
[ci skip]

hmacaroons.cabal
test/Crypto/Macaroon/Instances.hs

index a731592a8000d70bfac5cac101de0f890a284c2b..b70a9847a455862cd8bb8c1a6af717c09fed8cb6 100644 (file)
@@ -65,6 +65,7 @@ library
                   byteable >= 0.1 && <0.2,
                   cereal >= 0.4,
                   cryptohash >=0.11 && <0.12,
+                  either >=4.4,
                   -- cipher-aes >=0.2 && <0.3,
                   deepseq >= 1.1,
                   hex >= 0.1
@@ -105,5 +106,5 @@ test-suite test
                   tasty >= 0.10,
                   tasty-hunit >= 0.9,
                   tasty-quickcheck >= 0.8,
-                  QuickCheck < 2.8,
+                  QuickCheck >= 2.8,
                   hmacaroons
index c82bbd3b5d1822199fbb68f52be8125e36ead49e..69556378b5bd6965e98b51ed92644befd8d763a1 100644 (file)
@@ -23,19 +23,6 @@ import           Test.Tasty.QuickCheck
 
 import           Crypto.Macaroon
 
-
--- | Adjust the size parameter, by transforming it with the given
--- function.
--- Copied over from QuickCheck 2.8
-scale :: (Int -> Int) -> Gen a -> Gen a
-scale f g = sized (\n -> resize (f n) g)
-
-
--- | Generates a random subsequence of the given list.
--- Copied over from QuickCheck 2.8
-sublistOf :: [a] -> Gen [a]
-sublistOf = filterM (\_ -> choose (False, True))
-
 newtype Url = Url { unUrl :: BS.ByteString } deriving (Show)
 
 instance Arbitrary Url where