Skip to content

Commit 5bbc501

Browse files
committed
Compile against latest unison incomplete ordering checks
1 parent ac795ff commit 5bbc501

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

share-api/src/Share/Web/UCM/Sync/Impl.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ batchValidateEntities ::
398398
(ComponentHash -> ComponentHash -> IO Bool) ->
399399
(CausalHash -> CausalHash -> IO Bool) ->
400400
f (Hash32, Sync.Entity Text Hash32 Hash32) ->
401-
IO (Maybe (NonEmpty (Either HH.IncompleteElementOrderingError Sync.EntityValidationError)))
401+
IO (Maybe (NonEmpty (Either HH.HashingFailure Sync.EntityValidationError)))
402402
batchValidateEntities maxParallelism checkIfComponentHashMismatchIsAllowed checkIfCausalHashMismatchIsAllowed entities = do
403403
errs <- UnliftIO.pooledForConcurrentlyN maxParallelism entities \(hash, entity) ->
404404
validateEntity checkIfComponentHashMismatchIsAllowed checkIfCausalHashMismatchIsAllowed hash entity
@@ -410,7 +410,7 @@ validateEntity ::
410410
(CausalHash -> CausalHash -> m Bool) ->
411411
Hash32 ->
412412
Share.Entity Text Hash32 Hash32 ->
413-
m (Maybe (Either HH.IncompleteElementOrderingError Sync.EntityValidationError))
413+
m (Maybe (Either HH.HashingFailure Sync.EntityValidationError))
414414
validateEntity checkIfComponentHashMismatchIsAllowed checkIfCausalHashMismatchIsAllowed hash entity = do
415415
case (Sync.validateEntity hash entity) of
416416
Just (Right (err@(Sync.EntityHashMismatch Sync.TermComponentType (Sync.HashMismatchForEntity {supplied = expectedHash, computed = actualHash})))) ->

share-task-runner/src/Share/Tasks/AmbiguousComponentCheck.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Unison.Util.Servant.CBOR qualified as CBOR
1818

1919
data AmbiguousComponentCheckError
2020
= TaskAmbiguousComponentCheckError Hash32
21-
| TaskEntityValidationError Hash32 (Either HH.IncompleteElementOrderingError Sync.EntityValidationError)
21+
| TaskEntityValidationError Hash32 (Either HH.HashingFailure Sync.EntityValidationError)
2222
| TaskEntityDecodingError Hash32 CBOR.DeserialiseFailure
2323
deriving (Show, Eq)
2424

0 commit comments

Comments
 (0)