3 files changed, 19 insertions, 6 deletions
diff --git a/main/Main.hs b/main/Main.hs
index 000bbf9..fa2b4c1 100644
--- a/main/Main.hs
+++ b/main/Main.hs
@@ -40,17 +40,19 @@ import Erebos.Attach
 import Erebos.Contact
 import Erebos.Chatroom
 import Erebos.Conversation
+import Erebos.DirectMessage
 import Erebos.Discovery
 #ifdef ENABLE_ICE_SUPPORT
 import Erebos.ICE
 #endif
 import Erebos.Identity
-import Erebos.Message hiding (formatMessage)
 import Erebos.Network
+import Erebos.Object
 import Erebos.PubKey
 import Erebos.Service
 import Erebos.Set
 import Erebos.State
+import Erebos.Storable
 import Erebos.Storage
 import Erebos.Storage.Merge
 import Erebos.Sync
diff --git a/main/Test.hs b/main/Test.hs
index 4314852..35cc982 100644
--- a/main/Test.hs
+++ b/main/Test.hs
@@ -36,16 +36,18 @@ import System.IO.Error
 import Erebos.Attach
 import Erebos.Chatroom
 import Erebos.Contact
+import Erebos.DirectMessage
 import Erebos.Identity
-import Erebos.Message
 import Erebos.Network
+import Erebos.Object
 import Erebos.Pairing
 import Erebos.PubKey
 import Erebos.Service
 import Erebos.Set
 import Erebos.State
+import Erebos.Storable
 import Erebos.Storage
-import Erebos.Storage.Internal (unsafeStoreRawBytes)
+import Erebos.Storage.Head
 import Erebos.Storage.Merge
 import Erebos.Sync
 
@@ -300,12 +302,20 @@ commands = map (T.pack *** id)
 cmdStore :: Command
 cmdStore = do
     st <- asks tiStorage
+    pst <- liftIO $ derivePartialStorage st
     [otype] <- asks tiParams
     ls <- getLines
 
     let cnt = encodeUtf8 $ T.unlines ls
-    ref <- liftIO $ unsafeStoreRawBytes st $ BL.fromChunks [encodeUtf8 otype, BC.singleton ' ', BC.pack (show $ B.length cnt), BC.singleton '\n', cnt]
-    cmdOut $ "store-done " ++ show (refDigest ref)
+        full = BL.fromChunks
+            [ encodeUtf8 otype
+            , BC.singleton ' '
+            , BC.pack (show $ B.length cnt)
+            , BC.singleton '\n', cnt
+            ]
+    liftIO (copyRef st =<< storeRawBytes pst full) >>= \case
+        Right ref -> cmdOut $ "store-done " ++ show (refDigest ref)
+        Left _ -> cmdOut $ "store-failed"
 
 cmdLoad :: Command
 cmdLoad = do
diff --git a/main/Test/Service.hs b/main/Test/Service.hs
index 3e6eb83..8c58dee 100644
--- a/main/Test/Service.hs
+++ b/main/Test/Service.hs
@@ -8,8 +8,9 @@ import Control.Monad.Reader
 import Data.ByteString.Lazy.Char8 qualified as BL
 
 import Erebos.Network
+import Erebos.Object
 import Erebos.Service
-import Erebos.Storage
+import Erebos.Storable
 
 data TestMessage = TestMessage (Stored Object)