1 files changed, 35 insertions, 8 deletions
diff --git a/src/Erebos/Storage/Internal.hs b/src/Erebos/Storage/Internal.hs
index 73bdc55..db211bb 100644
--- a/src/Erebos/Storage/Internal.hs
+++ b/src/Erebos/Storage/Internal.hs
@@ -1,4 +1,27 @@
-module Erebos.Storage.Internal where
+module Erebos.Storage.Internal (
+    Storage'(..), Storage, PartialStorage,
+    Ref'(..), Ref, PartialRef,
+    RefDigest(..),
+    WatchID, startWatchID, nextWatchID,
+    WatchList(..), WatchListItem(..), watchListAdd, watchListDel,
+
+    refStorage,
+    refDigest, refDigestFromByteString,
+    showRef, showRefDigest, showRefDigestParts,
+    readRefDigest,
+    hashToRefDigest,
+
+    StorageCompleteness(..),
+    StorageBackend(..),
+    Complete, Partial,
+
+    unsafeStoreRawBytes,
+    ioLoadBytesFromStorage,
+
+    Generation(..),
+    HeadID(..), HeadTypeID(..),
+    Stored(..), storedStorage,
+) where
 
 import Control.Arrow
 import Control.Concurrent
@@ -14,6 +37,7 @@ import Data.ByteArray qualified as BA
 import Data.ByteString (ByteString)
 import Data.ByteString.Char8 qualified as BC
 import Data.ByteString.Lazy qualified as BL
+import Data.Function
 import Data.HashTable.IO qualified as HT
 import Data.Hashable
 import Data.Kind
@@ -216,17 +240,20 @@ newtype HeadID = HeadID UUID
 newtype HeadTypeID = HeadTypeID UUID
     deriving (Eq, Ord)
 
-data Stored' c a = Stored (Ref' c) a
+data Stored a = Stored
+    { storedRef' :: Ref
+    , storedObject' :: a
+    }
     deriving (Show)
 
-instance Eq (Stored' c a) where
-    Stored r1 _ == Stored r2 _  =  refDigest r1 == refDigest r2
+instance Eq (Stored a) where
+    (==)  =  (==) `on` (refDigest . storedRef')
 
-instance Ord (Stored' c a) where
-    compare (Stored r1 _) (Stored r2 _) = compare (refDigest r1) (refDigest r2)
+instance Ord (Stored a) where
+    compare  =  compare `on` (refDigest . storedRef')
 
-storedStorage :: Stored' c a -> Storage' c
-storedStorage (Stored (Ref st _) _) = st
+storedStorage :: Stored a -> Storage
+storedStorage = refStorage . storedRef'
 
 
 type Complete = Identity