summaryrefslogtreecommitdiff
path: root/Test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-05 11:12:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-05 11:12:01 -0400
commitc4990a41c430d541cefe27a53a39e7eb60e217a8 (patch)
tree21d81f15eb51cef5aa9a5047d0783e4ffbcb04e5 /Test.hs
parent217b0d3794ea466c64654b3bd91bbfb55cc40248 (diff)
rename constructor for clariy
Diffstat (limited to 'Test.hs')
-rw-r--r--Test.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Test.hs b/Test.hs
index 9eb99379e..83b4e9ee6 100644
--- a/Test.hs
+++ b/Test.hs
@@ -930,8 +930,8 @@ test_crypto env = "git-annex crypto" ~: TestList $ flip map ["shared","hybrid","
maybe False (\(Utility.Gpg.KeyIds ks2) ->
sort (nub ks2) == sort (nub ks')) ks
checkCipher encipher = Utility.Gpg.checkEncryptionStream encipher . Just
- checkScheme Types.Crypto.HybridCipher = scheme == "hybrid"
- checkScheme Types.Crypto.PubKeyCipher = scheme == "pubkey"
+ checkScheme Types.Crypto.Hybrid = scheme == "hybrid"
+ checkScheme Types.Crypto.PubKey = scheme == "pubkey"
checkKeys cip mvariant = do
cipher <- Crypto.decryptCipher cip
files <- filterM doesFileExist $
@@ -939,7 +939,7 @@ test_crypto env = "git-annex crypto" ~: TestList $ flip map ["shared","hybrid","
return (not $ null files) <&&> allM (checkFile mvariant) files
checkFile mvariant filename =
Utility.Gpg.checkEncryptionFile filename $
- if mvariant == Just Types.Crypto.PubKeyCipher then ks else Nothing
+ if mvariant == Just Types.Crypto.PubKey then ks else Nothing
key2files cipher = Locations.keyPaths .
Crypto.encryptKey Types.Crypto.HmacSha1 cipher
#else