factor out IncrementalHasher from IncrementalVerifier

This commit is contained in:
Joey Hess 2021-11-09 12:29:09 -04:00
parent 9d3ce224e3
commit 8034f2e9bb
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 68 additions and 48 deletions

View file

@ -372,7 +372,7 @@ retrieveChunks retriever u vc chunkconfig encryptor basek dest basep enc encc
finalize (Right Nothing) = return UnVerified
finalize (Right (Just iv)) =
liftIO (finalizeIncremental iv) >>= \case
liftIO (finalizeIncrementalVerifier iv) >>= \case
Just True -> return Verified
_ -> return UnVerified
finalize (Left v) = return v
@ -426,7 +426,7 @@ writeRetrievedContent dest enc encc mh mp content miv = case (enc, mh, content)
Just p ->
let writer = case miv of
Just iv -> \s -> do
updateIncremental iv s
updateIncrementalVerifier iv s
S.hPut h s
Nothing -> S.hPut h
in meteredWrite p writer b

View file

@ -83,5 +83,5 @@ httpBodyRetriever dest meterupdate iv resp
let sofar' = addBytesProcessed sofar $ S.length b
S.hPut h b
meterupdate sofar'
maybe noop (flip updateIncremental b) iv
maybe noop (flip updateIncrementalVerifier b) iv
go sofar' h