Skip to content

Commit

Permalink
Include review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
iquerejeta committed Nov 29, 2022
1 parent 9252f6e commit 146ecd0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions cardano-crypto-praos/src/Cardano/Crypto/VRF/Praos.hs
Expand Up @@ -428,14 +428,14 @@ vkToBatchCompat :: VerKeyVRF PraosVRF -> VerKeyVRF BC.PraosBatchCompatVRF
vkToBatchCompat praosVk =
case rawDeserialiseVerKeyVRF (rawSerialiseVerKeyVRF praosVk) of
Just vk -> vk
Nothing -> error "All valid Praos VKs are valid BatchCompat VKs."
Nothing -> error "Unable to convert PraosVK to BatchCompatVK."

-- | Construct a BatchCompat skey from praos, non-batchcompat
skToBatchCompat :: SignKeyVRF PraosVRF -> SignKeyVRF BC.PraosBatchCompatVRF
skToBatchCompat praosSk =
case rawDeserialiseSignKeyVRF (rawSerialiseSignKeyVRF praosSk) of
Just sk -> sk
Nothing -> error "All valid Praos SKs are valid BatchCompat SKs."
Nothing -> error "Unable to convert PraosSK to BatchCompatSK."

-- | Construct a BatchCompat output from praos, non-batchcompat
outputToBatchCompat :: OutputVRF PraosVRF -> OutputVRF BC.PraosBatchCompatVRF
Expand Down
16 changes: 7 additions & 9 deletions cardano-crypto-tests/src/Test/Crypto/VRF.hs
Expand Up @@ -30,9 +30,7 @@ import Test.Tasty.QuickCheck (testProperty, vectorOf)

{- HLINT IGNORE "Use <$>" -}

--
-- New type to generate random ByteStrings of size 32
--
-- | Newtype to generate random ByteStrings of size 32
newtype BS32 = BS32 { unBS32 :: BS.ByteString } deriving (Show)

--
Expand Down Expand Up @@ -225,23 +223,23 @@ prop_naturalToBytes (NonNegative sz) n =
--
-- Praos <-> BatchCompatPraos VerKey conversion
--
prop_pubKeyToBatchComopat :: VerKeyVRF PraosVRF -> Bool
prop_pubKeyToBatchComopat :: VerKeyVRF PraosVRF -> Property
prop_pubKeyToBatchComopat vk =
rawSerialiseVerKeyVRF (vkToBatchCompat vk) == rawSerialiseVerKeyVRF vk
rawSerialiseVerKeyVRF (vkToBatchCompat vk) === rawSerialiseVerKeyVRF vk

--
-- Praos <-> BatchCompatPraos SignKey conversion
--
prop_signKeyToBatchCompat :: SignKeyVRF PraosVRF -> Bool
prop_signKeyToBatchCompat :: SignKeyVRF PraosVRF -> Property
prop_signKeyToBatchCompat sk =
rawSerialiseSignKeyVRF (skToBatchCompat sk) == rawSerialiseSignKeyVRF sk
rawSerialiseSignKeyVRF (skToBatchCompat sk) === rawSerialiseSignKeyVRF sk

--
-- Praos <-> BatchCompatPraos Output conversion
--
prop_outputToBatchComat :: OutputVRF PraosVRF -> Bool
prop_outputToBatchComat :: OutputVRF PraosVRF -> Property
prop_outputToBatchComat output =
getOutputVRFBytes (outputToBatchCompat output) == getOutputVRFBytes output
getOutputVRFBytes (outputToBatchCompat output) === getOutputVRFBytes output

--
-- Praos <-> BatchCompatPraos VerKey compatibility. We check that a proof is validated with a
Expand Down

0 comments on commit 146ecd0

Please sign in to comment.