remote: drop old path utils

Author: sorki

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

@@ -108,12 +108,12 @@ querySubstitutablePathInfos ps = do
   cnt <- sockGetInt
   forM (take cnt $ cycle [(0 :: Int)]) $ pure $ do
       _pth <- sockGetPath
-      drv <- sockGetStr
+      drv <- sockGetPath
       refs <- sockGetPaths
       dlSize <- sockGetInt
       narSize' <- sockGetInt
       return $ SubstitutablePathInfo {
-                 deriver = mkPath drv
+                 deriver = drv
                , references = refs
                , downloadSize = dlSize
                , narSize = narSize'
@@ -128,7 +128,7 @@ queryPathInfoUncached path = do
   valid <- sockGetBool
   unless valid $ error "Path is not valid"
 
-  deriver <- mkPath <$> sockGetStr
+  deriver <- sockGetPath
   narHash <- lBSToText <$> sockGetStr
   references <- sockGetPaths
   registrationTime <- sockGet getTime

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

@@ -95,29 +95,12 @@ putText = putByteStringLen . textToLBS
 putTexts :: [Text] -> Put
 putTexts = putByteStrings . (map textToLBS)
 
-mkPath :: LBS.ByteString -> Maybe Path
-mkPath p = case (pathName $ lBSToText p) of
-             Just x -> Just $ Path (Hash.hash $ LBS.toStrict p) x
-             Nothing -> Nothing
-
-mkPathText :: T.Text -> Maybe Path
-mkPathText p = case pathName p of
-             Just x -> Just $ Path (Hash.hash $ BSC.pack $ T.unpack p) x
-             Nothing -> Nothing
-
 getPath :: Get (Maybe Path)
 getPath = parsePath <$> getByteStringLen
 
 getPaths :: Get PathSet
 getPaths = HashSet.fromList . catMaybes . map parsePath <$> getByteStrings
 
-{-
-putPath :: Path -> Put
-putPath (Path _digest name) = putText $ pathNameContents name
-
-putPaths :: PathSet -> Put
-putPaths = putByteStrings . HashSet.map (\(Path _digest name) -> textToLBS $ pathNameContents name)
--}
 putPath :: StoreDir -> Path -> Put
 putPath sd  = putText . storedToText . makeStored sd
 

hnix-store-remote/tests/NixDaemon.hs

@@ -142,6 +142,7 @@ withPath action = do
   (Just path) <- addTextToStore "hnix-store" "test" (HS.fromList [])  False
   action path
 
+invalidPath =  Path (hash "invalid") $ fromJust $ pathName "invalid"
 {-
  - broken
 
@@ -233,7 +234,7 @@ spec_protocol = Hspec.around withNixDaemon $ do
     context "isValidPathUncached" $ do
       itRights "validates path" $ withPath $ \path -> do
         (isValidPathUncached path) `shouldReturn` True
-      itLefts "fails on invalid path" $ isValidPathUncached $ fromJust $ mkPath "nopez"
+      itLefts "fails on invalid path" $ isValidPathUncached $ invalidPath
 
     context "queryAllValidPaths" $ do
       itRights "empty query" $ queryAllValidPaths