hide StorePath constructor, add unsafeMakeStorePath

Author: sorki

hnix-store-core/src/System/Nix/ReadonlyStore.hs

@@ -14,7 +14,7 @@ import Data.ByteString (ByteString)
 import Data.HashSet (HashSet)
 import System.Nix.Hash (BaseEncoding(Base16), NamedAlgo(algoName))
 import System.Nix.Store.Types (FileIngestionMethod(..), PathFilter, RepairMode)
-import System.Nix.StorePath (StoreDir, StorePath(StorePath), StorePathName)
+import System.Nix.StorePath (StoreDir, StorePath, StorePathName)
 
 import qualified Crypto.Hash
 import qualified Data.ByteString.Char8
@@ -35,7 +35,8 @@ makeStorePath
   -> Digest hashAlgo
   -> StorePathName
   -> StorePath
-makeStorePath storeDir ty h nm = StorePath storeHash nm
+makeStorePath storeDir ty h nm =
+ System.Nix.StorePath.unsafeMakeStorePath storeHash nm
  where
   storeHash = System.Nix.StorePath.mkStorePathHashPart @hashAlgo s
   s =

hnix-store-core/src/System/Nix/StorePath.hs

@@ -10,7 +10,9 @@ module System.Nix.StorePath
     StoreDir(..)
   , HasStoreDir(..)
   , getStoreDir
-  , StorePath(..)
+  , StorePath
+  , storePathHash
+  , storePathName
   , StorePathName
   , unStorePathName
   , StorePathHashPart
@@ -31,6 +33,8 @@ module System.Nix.StorePath
     parsePath
   , parsePathFromText
   , pathParser
+    -- * Utilities for tests
+  , unsafeMakeStorePath
   ) where
 
 import Control.Monad.Reader.Class (MonadReader, asks)
@@ -299,3 +303,13 @@ pathParser expectedRoot = do
     (fail . show)
     pure
     (StorePath <$> hashPart <*> name)
+
+-- * Utilities for tests
+
+-- | Paths rarely need to be constructed directly.
+-- Prefer @parsePath@ or @parsePathFromText@
+unsafeMakeStorePath
+  :: StorePathHashPart
+  -> StorePathName
+  -> StorePath
+unsafeMakeStorePath = StorePath

hnix-store-remote/tests-io/NixDaemon.hs

@@ -174,7 +174,7 @@ dummy = do
 invalidPath :: StorePath
 invalidPath =
   let name = Data.Either.fromRight (error "impossible") $ makeStorePathName "invalid"
-  in  StorePath (mkStorePathHashPart @SHA256 "invalid") name
+  in  unsafeMakeStorePath (mkStorePathHashPart @SHA256 "invalid") name
 
 withBuilder :: (StorePath -> MonadStore a) -> MonadStore a
 withBuilder action = do

hnix-store-tests/src/System/Nix/Arbitrary/StorePath.hs

@@ -11,9 +11,9 @@ import Crypto.Hash (SHA256)
 import qualified Data.ByteString.Char8
 import qualified Data.Text
 import System.Nix.StorePath (StoreDir(..)
-  , StorePath(..)
-  , StorePathName(..)
-  , StorePathHashPart(..)
+  , StorePath
+  , StorePathName
+  , StorePathHashPart
   )
 import qualified System.Nix.StorePath
 
@@ -27,7 +27,7 @@ instance Arbitrary StoreDir where
 
 instance Arbitrary StorePath where
   arbitrary =
-    liftA2 StorePath
+    liftA2 System.Nix.StorePath.unsafeMakeStorePath
       arbitrary
       arbitrary