simplify interface by removing size

Add size to the returned key after the fact, unless the remote happened
to add it itself.
This commit is contained in:
Joey Hess 2020-07-03 14:22:22 -04:00
parent 85cd79ea01
commit 57cceac569
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 8 additions and 4 deletions

View file

@ -391,7 +391,11 @@ importKeys remote importtreeconfig importcontent importablecontents = do
Nothing -> error "internal" -- checked earlier
Just a -> do
let importer p = do
k <- a loc cid sz p
unsizedk <- a loc cid p
-- This avoids every remote needing
-- to add the size.
let k = alterKey unsizedk $ \kd -> kd
{ keySize = keySize kd <|> Just sz }
checkSecureHashes k >>= \case
Nothing -> do
recordcidkey cidmap db cid k