Rename Erebos.Storage module to Erebos.Object.Internal

25 files changed, 26 insertions, 26 deletions

diff --git a/erebos.cabal b/erebos.cabal
index a11861a..93af480 100644
--- a/erebos.cabal
+++ b/erebos.cabal
@@ -107,12 +107,12 @@ library
         Erebos.Service
         Erebos.Set
         Erebos.State
-        Erebos.Storage
         Erebos.Storage.Key
         Erebos.Storage.Merge
         Erebos.Sync
 
         -- Used by test tool:
+        Erebos.Object.Internal
         Erebos.Storage.Internal
     other-modules:
         Erebos.Flow
diff --git a/main/Main.hs b/main/Main.hs
index 73def51..b2aca21 100644
--- a/main/Main.hs
+++ b/main/Main.hs
@@ -47,11 +47,11 @@ import Erebos.ICE
 import Erebos.Identity
 import Erebos.Message hiding (formatMessage)
 import Erebos.Network
+import Erebos.Object.Internal
 import Erebos.PubKey
 import Erebos.Service
 import Erebos.Set
 import Erebos.State
-import Erebos.Storage
 import Erebos.Storage.Merge
 import Erebos.Sync
 
diff --git a/main/Test.hs b/main/Test.hs
index 1b156ae..7dc7e43 100644
--- a/main/Test.hs
+++ b/main/Test.hs
@@ -37,12 +37,12 @@ import Erebos.Contact
 import Erebos.Identity
 import Erebos.Message
 import Erebos.Network
+import Erebos.Object.Internal
 import Erebos.Pairing
 import Erebos.PubKey
 import Erebos.Service
 import Erebos.Set
 import Erebos.State
-import Erebos.Storage
 import Erebos.Storage.Internal (unsafeStoreRawBytes)
 import Erebos.Storage.Merge
 import Erebos.Sync
diff --git a/main/Test/Service.hs b/main/Test/Service.hs
index 3e6eb83..c81722d 100644
--- a/main/Test/Service.hs
+++ b/main/Test/Service.hs
@@ -8,8 +8,8 @@ import Control.Monad.Reader
 import Data.ByteString.Lazy.Char8 qualified as BL
 
 import Erebos.Network
+import Erebos.Object.Internal
 import Erebos.Service
-import Erebos.Storage
 
 data TestMessage = TestMessage (Stored Object)
 
diff --git a/src/Erebos/Attach.hs b/src/Erebos/Attach.hs
index bd2f521..e0a240e 100644
--- a/src/Erebos/Attach.hs
+++ b/src/Erebos/Attach.hs
@@ -16,11 +16,11 @@ import qualified Data.Text as T
 
 import Erebos.Identity
 import Erebos.Network
+import Erebos.Object.Internal
 import Erebos.Pairing
 import Erebos.PubKey
 import Erebos.Service
 import Erebos.State
-import Erebos.Storage
 import Erebos.Storage.Key
 
 type AttachService = PairingService AttachIdentity
diff --git a/src/Erebos/Channel.hs b/src/Erebos/Channel.hs
index 5f66637..c17c9ab 100644
--- a/src/Erebos/Channel.hs
+++ b/src/Erebos/Channel.hs
@@ -26,8 +26,8 @@ import Data.ByteString.Lazy qualified as BL
 import Data.List
 
 import Erebos.Identity
+import Erebos.Object.Internal
 import Erebos.PubKey
-import Erebos.Storage
 
 data Channel = Channel
     { chPeers :: [Stored (Signed IdentityData)]
diff --git a/src/Erebos/Chatroom.hs b/src/Erebos/Chatroom.hs
index 8833450..25c8c17 100644
--- a/src/Erebos/Chatroom.hs
+++ b/src/Erebos/Chatroom.hs
@@ -49,11 +49,11 @@ import Data.Text (Text)
 import Data.Time
 
 import Erebos.Identity
+import Erebos.Object.Internal
 import Erebos.PubKey
 import Erebos.Service
 import Erebos.Set
 import Erebos.State
-import Erebos.Storage
 import Erebos.Storage.Merge
 import Erebos.Util
 
diff --git a/src/Erebos/Contact.hs b/src/Erebos/Contact.hs
index d90aa50..0af434f 100644
--- a/src/Erebos/Contact.hs
+++ b/src/Erebos/Contact.hs
@@ -23,12 +23,12 @@ import qualified Data.Text as T
 
 import Erebos.Identity
 import Erebos.Network
+import Erebos.Object.Internal
 import Erebos.Pairing
 import Erebos.PubKey
 import Erebos.Service
 import Erebos.Set
 import Erebos.State
-import Erebos.Storage
 import Erebos.Storage.Merge
 
 data Contact = Contact
diff --git a/src/Erebos/Conversation.hs b/src/Erebos/Conversation.hs
index 63475bd..4c68830 100644
--- a/src/Erebos/Conversation.hs
+++ b/src/Erebos/Conversation.hs
@@ -29,11 +29,11 @@ import Data.Text qualified as T
 import Data.Time.Format
 import Data.Time.LocalTime
 
-import Erebos.Identity
 import Erebos.Chatroom
+import Erebos.Identity
 import Erebos.Message hiding (formatMessage)
+import Erebos.Object.Internal
 import Erebos.State
-import Erebos.Storage
 
 
 data Message = DirectMessageMessage DirectMessage Bool
diff --git a/src/Erebos/Discovery.hs b/src/Erebos/Discovery.hs
index 48df9c3..d89a7fa 100644
--- a/src/Erebos/Discovery.hs
+++ b/src/Erebos/Discovery.hs
@@ -19,8 +19,8 @@ import Network.Socket
 import Erebos.ICE
 import Erebos.Identity
 import Erebos.Network
+import Erebos.Object.Internal
 import Erebos.Service
-import Erebos.Storage
 
 
 keepaliveSeconds :: Int
diff --git a/src/Erebos/ICE.chs b/src/Erebos/ICE.chs
index 096ee0d..787ce51 100644
--- a/src/Erebos/ICE.chs
+++ b/src/Erebos/ICE.chs
@@ -40,7 +40,7 @@ import Foreign.Ptr
 import Foreign.StablePtr
 
 import Erebos.Flow
-import Erebos.Storage
+import Erebos.Object.Internal
 
 #include "pjproject.h"
 
diff --git a/src/Erebos/Identity.hs b/src/Erebos/Identity.hs
index 577e5ac..fdfacfc 100644
--- a/src/Erebos/Identity.hs
+++ b/src/Erebos/Identity.hs
@@ -40,8 +40,8 @@ import qualified Data.Set as S
 import Data.Text (Text)
 import qualified Data.Text as T
 
+import Erebos.Object.Internal
 import Erebos.PubKey
-import Erebos.Storage
 import Erebos.Storage.Merge
 import Erebos.Util
 
diff --git a/src/Erebos/Message.hs b/src/Erebos/Message.hs
index 5ef27f3..a558d1a 100644
--- a/src/Erebos/Message.hs
+++ b/src/Erebos/Message.hs
@@ -31,9 +31,9 @@ import Data.Time.LocalTime
 
 import Erebos.Identity
 import Erebos.Network
+import Erebos.Object.Internal
 import Erebos.Service
 import Erebos.State
-import Erebos.Storage
 import Erebos.Storage.Merge
 
 data DirectMessage = DirectMessage
diff --git a/src/Erebos/Network.hs b/src/Erebos/Network.hs
index 2064d1c..358bb7c 100644
--- a/src/Erebos/Network.hs
+++ b/src/Erebos/Network.hs
@@ -63,10 +63,10 @@ import Erebos.ICE
 #endif
 import Erebos.Identity
 import Erebos.Network.Protocol
+import Erebos.Object.Internal
 import Erebos.PubKey
 import Erebos.Service
 import Erebos.State
-import Erebos.Storage
 import Erebos.Storage.Key
 import Erebos.Storage.Merge
 
diff --git a/src/Erebos/Network.hs-boot b/src/Erebos/Network.hs-boot
index 849bfc1..af77581 100644
--- a/src/Erebos/Network.hs-boot
+++ b/src/Erebos/Network.hs-boot
@@ -1,6 +1,6 @@
 module Erebos.Network where
 
-import Erebos.Storage
+import Erebos.Object.Internal
 
 data Server
 data Peer
diff --git a/src/Erebos/Network/Protocol.hs b/src/Erebos/Network/Protocol.hs
index cfbaea3..bceb355 100644
--- a/src/Erebos/Network/Protocol.hs
+++ b/src/Erebos/Network/Protocol.hs
@@ -67,8 +67,8 @@ import System.Clock
 import Erebos.Channel
 import Erebos.Flow
 import Erebos.Identity
+import Erebos.Object.Internal
 import Erebos.Service
-import Erebos.Storage
 
 
 protocolVersion :: Text
diff --git a/src/Erebos/Storage.hs b/src/Erebos/Object/Internal.hs
index 2cef6c0..638689a 100644
--- a/src/Erebos/Storage.hs
+++ b/src/Erebos/Object/Internal.hs
@@ -1,4 +1,4 @@
-module Erebos.Storage (
+module Erebos.Object.Internal (
     Storage, PartialStorage, StorageCompleteness,
     openStorage, memoryStorage,
     deriveEphemeralStorage, derivePartialStorage,
diff --git a/src/Erebos/Pairing.hs b/src/Erebos/Pairing.hs
index 2166e71..772eda0 100644
--- a/src/Erebos/Pairing.hs
+++ b/src/Erebos/Pairing.hs
@@ -27,10 +27,10 @@ import Data.Word
 
 import Erebos.Identity
 import Erebos.Network
+import Erebos.Object.Internal
 import Erebos.PubKey
 import Erebos.Service
 import Erebos.State
-import Erebos.Storage
 
 data PairingService a = PairingRequest (Stored (Signed IdentityData)) (Stored (Signed IdentityData)) RefDigest
                       | PairingResponse Bytes
diff --git a/src/Erebos/PubKey.hs b/src/Erebos/PubKey.hs
index 09a8e02..5d0cf62 100644
--- a/src/Erebos/PubKey.hs
+++ b/src/Erebos/PubKey.hs
@@ -21,7 +21,7 @@ import Data.ByteArray
 import Data.ByteString (ByteString)
 import qualified Data.Text as T
 
-import Erebos.Storage
+import Erebos.Object.Internal
 import Erebos.Storage.Key
 
 data PublicKey = PublicKey ED.PublicKey
diff --git a/src/Erebos/Service.hs b/src/Erebos/Service.hs
index f8428d1..5341c52 100644
--- a/src/Erebos/Service.hs
+++ b/src/Erebos/Service.hs
@@ -34,8 +34,8 @@ import qualified Data.UUID as U
 
 import Erebos.Identity
 import {-# SOURCE #-} Erebos.Network
+import Erebos.Object.Internal
 import Erebos.State
-import Erebos.Storage
 
 class (Typeable s, Storable s, Typeable (ServiceState s), Typeable (ServiceGlobalState s)) => Service s where
     serviceID :: proxy s -> ServiceID
diff --git a/src/Erebos/Set.hs b/src/Erebos/Set.hs
index c5edd56..1dc96ee 100644
--- a/src/Erebos/Set.hs
+++ b/src/Erebos/Set.hs
@@ -19,7 +19,7 @@ import Data.Map qualified as M
 import Data.Maybe
 import Data.Ord
 
-import Erebos.Storage
+import Erebos.Object.Internal
 import Erebos.Storage.Merge
 import Erebos.Util
 
diff --git a/src/Erebos/State.hs b/src/Erebos/State.hs
index 3012064..40896f7 100644
--- a/src/Erebos/State.hs
+++ b/src/Erebos/State.hs
@@ -35,8 +35,8 @@ import Data.UUID qualified as U
 import System.IO
 
 import Erebos.Identity
+import Erebos.Object.Internal
 import Erebos.PubKey
-import Erebos.Storage
 import Erebos.Storage.Merge
 
 data LocalState = LocalState
diff --git a/src/Erebos/Storage/Key.hs b/src/Erebos/Storage/Key.hs
index 5da79e3..9e52397 100644
--- a/src/Erebos/Storage/Key.hs
+++ b/src/Erebos/Storage/Key.hs
@@ -18,7 +18,7 @@ import System.Directory
 import System.FilePath
 import System.IO.Error
 
-import Erebos.Storage
+import Erebos.Object.Internal
 import Erebos.Storage.Internal
 
 class Storable pub => KeyPair sec pub | sec -> pub, pub -> sec where
diff --git a/src/Erebos/Storage/Merge.hs b/src/Erebos/Storage/Merge.hs
index a3b0fd7..d5d184e 100644
--- a/src/Erebos/Storage/Merge.hs
+++ b/src/Erebos/Storage/Merge.hs
@@ -31,7 +31,7 @@ import Data.Set qualified as S
 
 import System.IO.Unsafe (unsafePerformIO)
 
-import Erebos.Storage
+import Erebos.Object.Internal
 import Erebos.Storage.Internal
 import Erebos.Util
 
diff --git a/src/Erebos/Sync.hs b/src/Erebos/Sync.hs
index 04b5f11..71122f7 100644
--- a/src/Erebos/Sync.hs
+++ b/src/Erebos/Sync.hs
@@ -8,9 +8,9 @@ import Control.Monad.Reader
 import Data.List
 
 import Erebos.Identity
+import Erebos.Object.Internal
 import Erebos.Service
 import Erebos.State
-import Erebos.Storage
 import Erebos.Storage.Merge
 
 data SyncService = SyncPacket (Stored SharedState)