Remove MonadRandom from consensus #2372
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
UPDATE: after some help from @nfrisby, this is no longer needed, as |
mrBliss
force-pushed
the
mrBliss/update-deps-20200708
branch
2 times, most recently
from
e44a77e
to
bc04263
Compare
Fixes #2036. Update the dependencies on `cardano-base` and `cardano-ledger-specs`, bringing in IntersectMBO/cardano-base#139 and IntersectMBO/cardano-ledger#1621, which remove `MonadRandom` from the VRF Crypto class. This means we can remove `MonadRandom` from `checkIsLeader`. The implementation code no longer mentions `MonadRandom`, but the `TxGen` used in the ThreadNet tests still does.
mrBliss
force-pushed
the
mrBliss/update-deps-20200708
branch
2 times, most recently
from
5356faa
to
af8a3ec
Compare
mrBliss
force-pushed
the
mrBliss/update-deps-20200708
branch
from
af8a3ec
to
92ae175
Compare
mrBliss
commented
Jul 9, 2020
ouroboros-consensus/ouroboros-consensus-mock/test/Test/ThreadNet/Praos.hs
Outdated
Show resolved
Hide resolved
| where | ||
| go :: KESEvolution | ||
| -> KESEvolution | ||
| -> SignKeyKES (KES c) | ||
| -> Maybe (SignKeyKES (KES c)) | ||
| -> m (Maybe (SignKeyKES (KES c))) |
There was a problem hiding this comment.
Make non-monadic again, return a list of keys to forget.
| | Just targetEvolution <- toEvolution hk targetPeriod | ||
| = go targetEvolution (hkEvolution hk) (hkKey hk) >>= \case | ||
| Nothing -> return Nothing | ||
| Just key' -> return $ Just HotKey { |
There was a problem hiding this comment.
Forget the returned old keys before returning.
There was a problem hiding this comment.
Important: we never want to have a dangling pointer to a key that is forgotten. Accessing that key might result in a segfault (?) 😱
| , hkKey = key' | ||
| } | ||
| | otherwise | ||
| = return Nothing | ||
| where |
There was a problem hiding this comment.
| | targetEvolution < curEvolution | ||
| = Nothing | ||
| = forgetSignKeyKES key >> return Nothing |
Replace `Test.Util.Random` with `Test.ThreadNet.Util.Seed`, which uses QuickCheck instead of `MonadRandom`. Remove all mentions of `MonadRandom` from the testsuite and thus from the repository. This means the seeds mentioned in the regression tests are no longer the ones that produced the original failures. However, the seed is mainly used to generate transactions, so the regression tests that don't mention transactions are left in place with `Seed 0`. As we don't have a transaction generator for Byron, we can leave *all* those regression tests in place. A few tests for the mock protocols that relied on transactions were removed.
Take advantage of IntersectMBO/cardano-ledger#1630.
mrBliss
force-pushed
the
mrBliss/update-deps-20200708
branch
from
92ae175
to
9f14b95
Compare
mrBliss
changed the title
|
bors merge |
|
👎 Rejected by too few approved reviews |
|
bors merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WARNING: I believe the changes in
cardano-ledger-specsbreak compatibility with deployed testnets.Remove MonadRandom from consensus
Fixes #2036.
Update the dependencies on
cardano-baseandcardano-ledger-specs, bringingin IntersectMBO/cardano-base#139 and
IntersectMBO/cardano-ledger#1621, which
remove
MonadRandomfrom the VRF Crypto class.This means we can remove
MonadRandomfromcheckIsLeader.The implementation code no longer mentions
MonadRandom, but theTxGenusedin the ThreadNet tests still does.
test-infra: use Gen instead of MonadRandom in TxGen class
Replace
Test.Util.RandomwithTest.ThreadNet.Util.Seed, which usesQuickCheck instead of
MonadRandom.Remove all mentions of
MonadRandomfrom the testsuite and thus from therepository.
This means the seeds mentioned in the regression tests are no longer the ones
that produced the original failures. However, the seed is mainly used to
generate transactions, so the regression tests that don't mention transactions
are left in place with
Seed 0. As we don't have a transaction generator forByron, we can leave all those regression tests in place. A few tests for the
mock protocols that relied on transactions were removed.
Shelley: more efficient reapplyLedgerBlock
Take advantage of IntersectMBO/cardano-ledger#1630.