diff options
-rw-r--r-- | hmacaroons.cabal | 3 | ||||
-rw-r--r-- | test/Crypto/Macaroon/Instances.hs | 13 |
2 files changed, 2 insertions, 14 deletions
diff --git a/hmacaroons.cabal b/hmacaroons.cabal index a731592..b70a984 100644 --- a/hmacaroons.cabal +++ b/hmacaroons.cabal | |||
@@ -65,6 +65,7 @@ library | |||
65 | byteable >= 0.1 && <0.2, | 65 | byteable >= 0.1 && <0.2, |
66 | cereal >= 0.4, | 66 | cereal >= 0.4, |
67 | cryptohash >=0.11 && <0.12, | 67 | cryptohash >=0.11 && <0.12, |
68 | either >=4.4, | ||
68 | -- cipher-aes >=0.2 && <0.3, | 69 | -- cipher-aes >=0.2 && <0.3, |
69 | deepseq >= 1.1, | 70 | deepseq >= 1.1, |
70 | hex >= 0.1 | 71 | hex >= 0.1 |
@@ -105,5 +106,5 @@ test-suite test | |||
105 | tasty >= 0.10, | 106 | tasty >= 0.10, |
106 | tasty-hunit >= 0.9, | 107 | tasty-hunit >= 0.9, |
107 | tasty-quickcheck >= 0.8, | 108 | tasty-quickcheck >= 0.8, |
108 | QuickCheck < 2.8, | 109 | QuickCheck >= 2.8, |
109 | hmacaroons | 110 | hmacaroons |
diff --git a/test/Crypto/Macaroon/Instances.hs b/test/Crypto/Macaroon/Instances.hs index c82bbd3..6955637 100644 --- a/test/Crypto/Macaroon/Instances.hs +++ b/test/Crypto/Macaroon/Instances.hs | |||
@@ -23,19 +23,6 @@ import Test.Tasty.QuickCheck | |||
23 | 23 | ||
24 | import Crypto.Macaroon | 24 | import Crypto.Macaroon |
25 | 25 | ||
26 | |||
27 | -- | Adjust the size parameter, by transforming it with the given | ||
28 | -- function. | ||
29 | -- Copied over from QuickCheck 2.8 | ||
30 | scale :: (Int -> Int) -> Gen a -> Gen a | ||
31 | scale f g = sized (\n -> resize (f n) g) | ||
32 | |||
33 | |||
34 | -- | Generates a random subsequence of the given list. | ||
35 | -- Copied over from QuickCheck 2.8 | ||
36 | sublistOf :: [a] -> Gen [a] | ||
37 | sublistOf = filterM (\_ -> choose (False, True)) | ||
38 | |||
39 | newtype Url = Url { unUrl :: BS.ByteString } deriving (Show) | 26 | newtype Url = Url { unUrl :: BS.ByteString } deriving (Show) |
40 | 27 | ||
41 | instance Arbitrary Url where | 28 | instance Arbitrary Url where |