3 files changed, 8 insertions, 30 deletions
diff --git a/src/Erebos/Storage/Disk.hs b/src/Erebos/Storage/Disk.hs
index 370c584..8e35940 100644
--- a/src/Erebos/Storage/Disk.hs
+++ b/src/Erebos/Storage/Disk.hs
@@ -18,7 +18,6 @@ import Data.ByteString.Lazy.Char8 qualified as BLC
 import Data.Function
 import Data.List
 import Data.Maybe
-import Data.UUID qualified as U
 
 import System.Directory
 import System.FSNotify
@@ -31,6 +30,7 @@ import Erebos.Storage.Backend
 import Erebos.Storage.Head
 import Erebos.Storage.Internal
 import Erebos.Storage.Platform
+import Erebos.UUID qualified as U
 
 
 data DiskStorage = StorageDir
diff --git a/src/Erebos/Storage/Head.hs b/src/Erebos/Storage/Head.hs
index 8f8e009..3239fe0 100644
--- a/src/Erebos/Storage/Head.hs
+++ b/src/Erebos/Storage/Head.hs
@@ -28,13 +28,12 @@ import Control.Monad.Reader
 
 import Data.Bifunctor
 import Data.Typeable
-import Data.UUID qualified as U
-import Data.UUID.V4 qualified as U
 
 import Erebos.Object
 import Erebos.Storable
 import Erebos.Storage.Backend
 import Erebos.Storage.Internal
+import Erebos.UUID qualified as U
 
 
 -- | Represents loaded Erebos storage head, along with the object it pointed to
diff --git a/src/Erebos/Storage/Internal.hs b/src/Erebos/Storage/Internal.hs
index 6df1410..73bdc55 100644
--- a/src/Erebos/Storage/Internal.hs
+++ b/src/Erebos/Storage/Internal.hs
@@ -4,29 +4,28 @@ import Control.Arrow
 import Control.Concurrent
 import Control.DeepSeq
 import Control.Exception
-import Control.Monad
 import Control.Monad.Identity
 
 import Crypto.Hash
 
 import Data.Bits
-import Data.ByteArray (ByteArray, ByteArrayAccess, ScrubbedBytes)
+import Data.ByteArray (ByteArrayAccess, ScrubbedBytes)
 import Data.ByteArray qualified as BA
 import Data.ByteString (ByteString)
-import Data.ByteString qualified as B
 import Data.ByteString.Char8 qualified as BC
 import Data.ByteString.Lazy qualified as BL
-import Data.Char
 import Data.HashTable.IO qualified as HT
 import Data.Hashable
 import Data.Kind
 import Data.Typeable
-import Data.UUID (UUID)
 
 import Foreign.Storable (peek)
 
 import System.IO.Unsafe (unsafePerformIO)
 
+import Erebos.UUID (UUID)
+import Erebos.Util
+
 
 data Storage' c = forall bck. (StorageBackend bck, BackendCompleteness bck ~ c) => Storage
     { stBackend :: bck
@@ -196,35 +195,15 @@ showRefDigest = showRefDigestParts >>> \(alg, hex) -> alg <> BC.pack "#" <> hex
 readRefDigest :: ByteString -> Maybe RefDigest
 readRefDigest x = case BC.split '#' x of
                        [alg, dgst] | BA.convert alg == BC.pack "blake2" ->
-                           refDigestFromByteString =<< readHex @ByteString dgst
+                           refDigestFromByteString =<< readHex dgst
                        _ -> Nothing
 
-refDigestFromByteString :: ByteArrayAccess ba => ba -> Maybe RefDigest
+refDigestFromByteString :: ByteString -> Maybe RefDigest
 refDigestFromByteString = fmap RefDigest . digestFromByteString
 
 hashToRefDigest :: BL.ByteString -> RefDigest
 hashToRefDigest = RefDigest . hashFinalize . hashUpdates hashInit . BL.toChunks
 
-showHex :: ByteArrayAccess ba => ba -> ByteString
-showHex = B.concat . map showHexByte . BA.unpack
-    where showHexChar x | x < 10    = x + o '0'
-                        | otherwise = x + o 'a' - 10
-          showHexByte x = B.pack [ showHexChar (x `div` 16), showHexChar (x `mod` 16) ]
-          o = fromIntegral . ord
-
-readHex :: ByteArray ba => ByteString -> Maybe ba
-readHex = return . BA.concat <=< readHex'
-    where readHex' bs | B.null bs = Just []
-          readHex' bs = do (bx, bs') <- B.uncons bs
-                           (by, bs'') <- B.uncons bs'
-                           x <- hexDigit bx
-                           y <- hexDigit by
-                           (B.singleton (x * 16 + y) :) <$> readHex' bs''
-          hexDigit x | x >= o '0' && x <= o '9' = Just $ x - o '0'
-                     | x >= o 'a' && x <= o 'z' = Just $ x - o 'a' + 10
-                     | otherwise                = Nothing
-          o = fromIntegral . ord
-
 
 newtype Generation = Generation Int
     deriving (Eq, Show)