Skip to content

Commit

Permalink
password/test: backwards-compatible 'ByteString.fromStrict' fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Vlix committed Oct 20, 2024
1 parent 573dfc8 commit abf2e55
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion password/test/tasty/Argon2.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings #-}
module Argon2 (testArgon2) where

import Data.ByteString (fromStrict)
import Data.ByteString.Lazy (fromStrict)
import Data.Text.Encoding (encodeUtf8)
import Test.Tasty (TestTree, testGroup)
import Test.Tasty.HUnit (assertBool, assertEqual, testCase)
Expand Down
2 changes: 1 addition & 1 deletion password/test/tasty/Bcrypt.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings #-}
module Bcrypt where

import Data.ByteString (fromStrict)
import Data.ByteString.Lazy (fromStrict)
import Data.Text (pack)
import Data.Text.Encoding (encodeUtf8)
import Test.Tasty
Expand Down
3 changes: 2 additions & 1 deletion password/test/tasty/PBKDF2.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ module PBKDF2 where

import Crypto.Hash.Algorithms as Crypto (HashAlgorithm, SHA1(..), SHA256(..), SHA512(..))
import Crypto.KDF.PBKDF2 as PBKDF2
import Data.ByteString (ByteString, fromStrict)
import Data.ByteString (ByteString)
import Data.ByteString.Lazy (fromStrict)
#if !MIN_VERSION_base(4,13,0)
import Data.Semigroup ((<>))
#endif
Expand Down
2 changes: 1 addition & 1 deletion password/test/tasty/Scrypt.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{-# LANGUAGE OverloadedStrings #-}
module Scrypt where

import Data.ByteString (fromStrict)
import Data.ByteString.Lazy (fromStrict)
import Data.Maybe (fromJust)
import Data.Text (Text)
import Data.Text.Encoding (encodeUtf8)
Expand Down

0 comments on commit abf2e55

Please sign in to comment.