simplify base64 to only use ByteString
Note the use of fromString and toString from Data.ByteString.UTF8 dated back to commit9b93278e8a
. Back then it was using the dataenc package for base64, which operated on Word8 and String. But with the switch to sandi, it uses ByteString, and indeed fromB64' and toB64' were already using ByteString without that complication. So I think there is no risk of such an encoding related breakage. I also tested the case that9b93278e8a
fixed: git-annex metadata -s foo='a …' x git-annex metadata x metadata x foo=a … In Remote.Helper.Encryptable, it was avoiding using Utility.Base64 because of that UTF8 conversion. Since that's no longer done, it can just use it now.
This commit is contained in:
parent
985dd38847
commit
3742263c99
7 changed files with 27 additions and 71 deletions
2
Test.hs
2
Test.hs
|
@ -77,7 +77,6 @@ import qualified Utility.Hash
|
|||
import qualified Utility.Scheduled
|
||||
import qualified Utility.Scheduled.QuickCheck
|
||||
import qualified Utility.HumanTime
|
||||
import qualified Utility.Base64
|
||||
import qualified Utility.Tmp.Dir
|
||||
import qualified Utility.FileSystemEncoding
|
||||
import qualified Utility.Aeson
|
||||
|
@ -184,7 +183,6 @@ properties = localOption (QuickCheckTests 1000) $ testGroup "QuickCheck" $
|
|||
, testProperty "prop_viewPath_roundtrips" Annex.View.prop_viewPath_roundtrips
|
||||
, testProperty "prop_view_roundtrips" Annex.View.prop_view_roundtrips
|
||||
, testProperty "prop_viewedFile_rountrips" Annex.View.ViewedFile.prop_viewedFile_roundtrips
|
||||
, testProperty "prop_b64_roundtrips" Utility.Base64.prop_b64_roundtrips
|
||||
, testProperty "prop_standardGroups_parse" Logs.PreferredContent.prop_standardGroups_parse
|
||||
] ++ map (uncurry testProperty) combos
|
||||
where
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue