SyncV2 cleanup

Author: ChrisPenner

unison-cli/src/Unison/Share/SyncV2.hs

@@ -66,9 +66,9 @@ import UnliftIO qualified as IO
 
 type Stream i o = ConduitT i o StreamM ()
 
-type PullErr = SyncError SyncV2.PullError
+type SyncErr = SyncError SyncV2.PullError
 
-type StreamM = (ExceptT PullErr (C.ResourceT IO))
+type StreamM = (ExceptT SyncErr (C.ResourceT IO))
 
 batchSize :: Int
 batchSize = 5000
@@ -115,7 +115,7 @@ syncSortedStream codebase stream = do
         validateAndSave codebase (catMaybes entityBatch)
   C.runConduit $ stream C..| C.chunksOf batchSize C..| handler
 
-unpackChunk :: SyncV2.EntityChunk -> ExceptT PullErr Sqlite.Transaction (Maybe (Hash32, TempEntity))
+unpackChunk :: SyncV2.EntityChunk -> ExceptT SyncErr Sqlite.Transaction (Maybe (Hash32, TempEntity))
 unpackChunk = \case
   SyncV2.EntityChunk {hash, entityCBOR = entityBytes} -> do
     -- Only want entities we don't already have
@@ -124,18 +124,18 @@ unpackChunk = \case
       _ -> do
         (Just . (hash,)) <$> unpackEntity entityBytes
     where
-      unpackEntity :: (CBORBytes TempEntity) -> ExceptT PullErr Sqlite.Transaction TempEntity
+      unpackEntity :: (CBORBytes TempEntity) -> ExceptT SyncErr Sqlite.Transaction TempEntity
       unpackEntity entityBytes = do
         case CBOR.deserialiseOrFailCBORBytes entityBytes of
           Left err -> do throwError $ (SyncError . SyncV2.PullError'Sync $ SyncV2.SyncErrorDeserializationFailure err)
           Right entity -> pure entity
 
-unpackChunks :: [SyncV2.EntityChunk] -> ExceptT PullErr Sqlite.Transaction [(Hash32, TempEntity)]
+unpackChunks :: [SyncV2.EntityChunk] -> ExceptT SyncErr Sqlite.Transaction [(Hash32, TempEntity)]
 unpackChunks xs = do
   for xs unpackChunk
     <&> catMaybes
 
-batchValidateEntities :: [(Hash32, TempEntity)] -> ExceptT PullErr IO ()
+batchValidateEntities :: [(Hash32, TempEntity)] -> ExceptT SyncErr IO ()
 batchValidateEntities entities = do
   mismatches <- fmap catMaybes $ liftIO $ IO.pooledForConcurrently entities \(hash, entity) -> do
     IO.evaluate $ EV.validateTempEntity hash entity
@@ -281,7 +281,7 @@ syncToFile ::
   CausalHash ->
   Maybe SyncV2.BranchRef ->
   FilePath ->
-  IO (Either PullErr ())
+  IO (Either SyncErr ())
 syncToFile codebase rootHash mayBranchRef destFilePath = do
   liftIO $ Codebase.withConnection codebase \conn -> do
     liftIO . C.runResourceT . runExceptT $ withEntityStream conn rootHash mayBranchRef \stream -> do
@@ -327,13 +327,13 @@ decodeUnframedEntities = C.transPipe (mapExceptT (lift . stToIO)) $ do
       d <- newDecoder
       loop bs d
   where
-    newDecoder :: ConduitT ByteString SyncV2.DownloadEntitiesChunk (ExceptT PullErr (ST s)) (Maybe ByteString -> ST s (CBOR.IDecode s (SyncV2.DownloadEntitiesChunk)))
+    newDecoder :: ConduitT ByteString SyncV2.DownloadEntitiesChunk (ExceptT SyncErr (ST s)) (Maybe ByteString -> ST s (CBOR.IDecode s (SyncV2.DownloadEntitiesChunk)))
     newDecoder = do
       (lift . lift) CBOR.deserialiseIncremental >>= \case
         CBOR.Done _ _ _ -> throwError . SyncError . SyncV2.PullError'Sync $ SyncV2.SyncErrorStreamFailure "Invalid initial decoder"
         CBOR.Fail _ _ err -> throwError . SyncError . SyncV2.PullError'Sync $ SyncV2.SyncErrorDeserializationFailure err
         CBOR.Partial k -> pure k
-    loop :: ByteString -> (Maybe ByteString -> ST s (CBOR.IDecode s (SyncV2.DownloadEntitiesChunk))) -> ConduitT ByteString SyncV2.DownloadEntitiesChunk (ExceptT PullErr (ST s)) ()
+    loop :: ByteString -> (Maybe ByteString -> ST s (CBOR.IDecode s (SyncV2.DownloadEntitiesChunk))) -> ConduitT ByteString SyncV2.DownloadEntitiesChunk (ExceptT SyncErr (ST s)) ()
     loop bs k = do
       (lift . lift) (k (Just bs)) >>= \case
         CBOR.Fail _ _ err -> throwError . SyncError . SyncV2.PullError'Sync $ SyncV2.SyncErrorDeserializationFailure err