@@ -4,14 +4,11 @@ import Control.Monad.Except (MonadError, throwError)
44import Control.Monad.IO.Class (MonadIO (.. ))
55import Control.Monad.Reader (MonadReader , ask , asks )
66import Data.ByteString (ByteString )
7- import Data.HashSet (HashSet )
87import Data.Serialize.Get (Get , Result (.. ))
98import Data.Serialize.Put (Put , runPut )
109import Network.Socket.ByteString (recv , sendAll )
11- import System.Nix.StorePath (StorePath )
12- import System.Nix.Store.Remote.MonadStore (MonadRemoteStore , MonadRemoteStoreR , RemoteStoreError (.. ), getStoreDir )
10+ import System.Nix.Store.Remote.MonadStore (MonadRemoteStoreR , RemoteStoreError (.. ))
1311import System.Nix.Store.Remote.Serializer (NixSerializer , runP , runSerialT )
14- import System.Nix.Store.Remote.Serialize.Prim (getInt , getByteString , getByteStrings , getPath , getPathsOrFail )
1512import System.Nix.Store.Remote.Types (HasStoreSocket (.. ))
1613
1714import qualified Control.Exception
@@ -114,67 +111,3 @@ sockGetS s = do
114111 case res of
115112 Right x -> pure x
116113 Left e -> throwError e
117-
118- -- * Obsolete
119-
120- getSocketIncremental
121- :: (MonadRemoteStore m , Show a )
122- => Get a
123- -> m a
124- getSocketIncremental = genericIncremental sockGet8
125-
126- sockGet
127- :: (MonadRemoteStore m , Show a )
128- => Get a
129- -> m a
130- sockGet = getSocketIncremental
131-
132- sockGetInt
133- :: (Integral a , MonadRemoteStore m , Show a )
134- => m a
135- sockGetInt = getSocketIncremental getInt
136-
137- sockGetBool
138- :: MonadRemoteStore m
139- => m Bool
140- sockGetBool = (== (1 :: Int )) <$> sockGetInt
141-
142- sockGetStr
143- :: MonadRemoteStore m
144- => m ByteString
145- sockGetStr = getSocketIncremental getByteString
146-
147- sockGetStrings
148- :: MonadRemoteStore m
149- => m [ByteString ]
150- sockGetStrings = getSocketIncremental getByteStrings
151-
152- sockGetPath
153- :: MonadRemoteStore m
154- => m StorePath
155- sockGetPath = do
156- sd <- getStoreDir
157- pth <- getSocketIncremental (getPath sd)
158- either
159- (throwError . RemoteStoreError_Fixme . show )
160- pure
161- pth
162-
163- sockGetPathMay
164- :: MonadRemoteStore m
165- => m (Maybe StorePath )
166- sockGetPathMay = do
167- sd <- getStoreDir
168- pth <- getSocketIncremental (getPath sd)
169- pure $
170- either
171- (const Nothing )
172- Just
173- pth
174-
175- sockGetPaths
176- :: MonadRemoteStore m
177- => m (HashSet StorePath )
178- sockGetPaths = do
179- sd <- getStoreDir
180- getSocketIncremental (getPathsOrFail sd)
0 commit comments