make everything build again after ByteString Key changes

This commit is contained in:
Joey Hess 2019-01-11 16:34:04 -04:00
parent 151562b537
commit 727767e1e2
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
23 changed files with 79 additions and 72 deletions

View file

@ -76,8 +76,6 @@ module Annex.Locations (
hashDirLower,
preSanitizeKeyName,
reSanitizeKeyName,
prop_isomorphic_fileKey
) where
import Data.Char
@ -85,7 +83,6 @@ import Data.Default
import Common
import Key
import Types.Key
import Types.UUID
import Types.GitConfig
import Types.Difference
@ -529,14 +526,6 @@ fileKey = file2key . unesc []
unesc r ('&':'a':cs) = unesc ('&':r) cs
unesc r (c:cs) = unesc (c:r) cs
{- for quickcheck -}
prop_isomorphic_fileKey :: String -> Bool
prop_isomorphic_fileKey s
| null s = True -- it's not legal for a key to have no keyName
| otherwise= Just k == fileKey (keyFile k)
where
k = stubKey { keyName = s, keyVariety = OtherKey "test" }
{- A location to store a key on a special remote that uses a filesystem.
- A directory hash is used, to protect against filesystems that dislike
- having many items in a single directory.