fixup! fixup! fixup! simple store path root, remote store rework

Author: sorki

hnix-store-remote/hnix-store-remote.cabal

@@ -22,7 +22,6 @@ library
                      , System.Nix.Store.Remote.Util
 
   build-depends:       base >=4.10 && <5
-                     , cryptonite
                      , bytestring
                      , binary
                      , bytestring

hnix-store-remote/src/System/Nix/Store/Remote/Binary.hs

@@ -16,6 +16,16 @@ putInt = putWord64le . fromIntegral
 getInt :: Integral a => Get a
 getInt = fromIntegral <$> getWord64le
 
+putMany :: Foldable t => (a -> Put) -> t a -> Put
+putMany printer xs = do
+  putInt (length xs)
+  mapM_ printer xs
+
+getMany :: Get a -> Get [a]
+getMany parser = do
+  count <- getInt
+  replicateM count parser
+
 -- length prefixed string packing with padding to 8 bytes
 putByteStringLen :: BSL.ByteString -> Put
 putByteStringLen x = do
@@ -29,9 +39,7 @@ putByteStringLen x = do
     pad count = sequence_ $ replicate count (putWord8 0)
 
 putByteStrings :: Foldable t => t BSL.ByteString -> Put
-putByteStrings xs = do
-  putInt $ length xs
-  mapM_ putByteStringLen xs
+putByteStrings = putMany putByteStringLen
 
 getByteStringLen :: Get ByteString
 getByteStringLen = do
@@ -44,8 +52,4 @@ getByteStringLen = do
   where unpad x = sequence $ replicate x getWord8
 
 getByteStrings :: Get [ByteString]
-getByteStrings = do
-  count <- getInt
-  res <- sequence $ replicate count getByteStringLen
-  return res
-
+getByteStrings = getMany getByteStringLen

hnix-store-remote/src/System/Nix/Store/Remote/Util.hs

@@ -132,11 +132,6 @@ putTime = (putInt :: Int -> Put) . round . utcTimeToPOSIXSeconds
 getTime :: Get UTCTime
 getTime = posixSecondsToUTCTime <$> getEnum
 
-getMany :: Get a -> Get [a]
-getMany parser = do
-  count <- getInt
-  replicateM count parser
-
 getBuildResult :: Get BuildResult
 getBuildResult = BuildResult
   <$> getEnum