haskell-nix/hnix-store
1
1
Fork 0
mirror of https://github.com/haskell-nix/hnix-store.git synced 2024-09-11 18:05:56 +03:00
Code Issues Projects Releases Wiki Activity

remote: Client, no more need for nested runRemoteStoreT

Browse Source
This commit is contained in:
sorki 2023-12-03 15:06:28 +01:00
parent f1f30af6d5
commit 82262a1b1d
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hnix-store-remote/src/System/Nix/Store/Remote/Client.hs
View File

@ -17,7 +17,6 @@ module System.Nix.Store.Remote.Client
import Control.Monad (unless, when)
import Control.Monad.Except (throwError)
import Control.Monad.IO.Class (MonadIO, liftIO)
import Control.Monad.Reader (ask)
import Data.Serialize.Put (Put, runPut)
import Data.Some (Some(Some))
@ -104,9 +103,7 @@ doReq
-> m a
doReq = \case
x -> do
cfg <- ask
_ <- runRemoteStoreT cfg $
sockPutS (mapErrorS RemoteStoreError_SerializerPut storeRequest) (Some x)
sockPutS (mapErrorS RemoteStoreError_SerializerPut storeRequest) (Some x)
case x of
AddToStore {} -> do
@ -119,16 +116,9 @@ doReq = \case
_ -> pure ()
--either (throwError @RemoteStoreError @m) (\() -> pure ()) . fst
-- <$> runRemoteStoreT cfg processOutput
processOutput
--either throwError pure . fst <$> runRemoteStoreT cfg $
eres <- runRemoteStoreT cfg $
sockGetS (mapErrorS RemoteStoreError_SerializerGet (getReply @a))
sockGetS (mapErrorS RemoteStoreError_SerializerGet (getReply @a))
case eres of
(Left e, _logs) -> throwError e
(Right res, _logs) -> pure res
class StoreReply a where
getReply