Rewrite generators to use the QC size parameter #2829
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
| AssetId | ||
| <$> resize sizeSquareRoot genTokenPolicyId | ||
| <*> resize sizeSquareRoot genTokenName | ||
| genAssetId = genSized2With AssetId genTokenPolicyId genTokenName |
There was a problem hiding this comment.
Thanks!
If we ever have to make a generator for values composed of more than two parts, we can easily make a similar genSized3/genSizedWith3 function.
Though I'm hoping we won't need such a thing. 😄
jonathanknowles
force-pushed
the
jonathanknowles/sized-generators-shrinkers
branch
from
118243f to
9465479
Compare
sevanspowell
approved these changes
Aug 17, 2021
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Aug 17, 2021
2829: Rewrite generators to use the QC size parameter r=jonathanknowles a=jonathanknowles ### Issue Number Follow-up from #2768 Supports work for #2819 ### Comments This PR adjusts generators for the following types to use the QC size parameter: - `Address` - `Hash "Tx"` - `TxIndex` (`Word32`) - `TxIn` - `TxOut` - `UTxO` - `UTxOIndex` Some minor adjustments to coverage conditions were necessary (but surprisingly few). This PR also: - Adds the module `UTxO.Gen`, so that we can generate values of `UTxO` without having to generate indices (which add extra overhead), and redefines the `UTxOIndex` generators in terms of these generators. - Adds the functions `genSized2` and `genSized2With`, which restore size linearity to generators of compound values (those defined in terms of other generators). Co-authored-by: Jonathan Knowles <[email protected]>
|
Build failed: Couldn't determine why this build failed. It seems that it ended shortly after reaching this point: [13 of 92] Compiling Cardano.Wallet.Primitive.Types.TokenQuantity ( src/Cardano/Wallet/Primitive/Types/TokenQuantity.hs, dist/build/Cardano/Wallet/Primitive/Types/TokenQuantity.o, dist/build/Cardano/Wallet/Primitive/Types/TokenQuantity.dyn_o )
[14 of 92] Compiling Cardano.Wallet.Primitive.Types.TokenMap ( src/Cardano/Wallet/Primitive/Types/TokenMap.hs, dist/build/Cardano/Wallet/Primitive/Types/TokenMap.o, dist/build/Cardano/Wallet/Primitive/Types/TokenMap.dyn_o ) |
This is consistent with the convention for many other types. For example: - unCoin - unNegativeCoin - unNodePort - unPretty - unTokenQuantity The `un` prefix is arguably more consistent with the meaning, which is to *unwrap* a `UTxO` rather than to *get* a `UTxO`.
These combinators make it possible to restore size linearity to generators composed of other generators that depend on the size parameter.
This commit:
- creates a new module `UTxO.Gen` which has generators and shrinkers for
ordinary UTxO sets (without indices).
- redefines the functions in `UTxOIndex.Gen` to reuse those in `UTxO.Gen`.
We can now use the generators within `UTxO.Gen` to generate plain UTxO sets
without having to generate indices (which carry more overhead).
This commit makes some small adjustments to coverage checks in light of recent changes to generators.
It's expected that these tests can fail after changes to generators. The new values are still within acceptable tolerances.
jonathanknowles
force-pushed
the
jonathanknowles/sized-generators-shrinkers
branch
from
40f89d1 to
1750489
Compare
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Aug 17, 2021
2829: Rewrite generators to use the QC size parameter r=jonathanknowles a=jonathanknowles ### Issue Number Follow-up from #2768 Supports work for #2819 ### Comments This PR adjusts generators for the following types to use the QC size parameter: - `Address` - `Hash "Tx"` - `TxIndex` (`Word32`) - `TxIn` - `TxOut` - `UTxO` - `UTxOIndex` Some minor adjustments to coverage conditions were necessary (but surprisingly few). This PR also: - Adds the module `UTxO.Gen`, so that we can generate values of `UTxO` without having to generate indices (which add extra overhead), and redefines the `UTxOIndex` generators in terms of these generators. - Adds the functions `genSized2` and `genSized2With`, which restore size linearity to generators of compound values (those defined in terms of other generators). Co-authored-by: Jonathan Knowles <[email protected]>
|
Build failed: Failure: Although what is interesting here, is that the |
|
bors r+ |
|
Build succeeded: |
rvl
reviewed
Aug 18, 2021
| -- >>> <*> scaleToRoot 3 genB | ||
| -- >>> <*> scaleToRoot 3 genC | ||
| -- | ||
| scaleToRoot :: Int -> Gen a -> Gen a |
There was a problem hiding this comment.
This is a nice idea which might be needed very occasionally, but in general, I don't believe we need to fret too much over the size parameter. It's not meant to be so precise - for example, instance Arbitrary (a,b,c,d,e) in QuickCheck doesn't do any such scaling. From the developer perspective, it's fairly obvious that if you have a big ADT then its total size and range will be bigger than that of a small ADT.
3 tasks
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.
Issue Number
Follow-up from #2768
Supports work for #2819
Comments
This PR adjusts generators for the following types to use the QC size parameter:
AddressHash "Tx"TxIndex(Word32)TxInTxOutUTxOUTxOIndexSome minor adjustments to coverage conditions were necessary (but surprisingly few).
This PR also:
UTxO.Gen, so that we can generate values ofUTxOwithout having to generate indices (which add extra overhead), and redefines theUTxOIndexgenerators in terms of these generators.genSized2andgenSized2With, which restore size linearity to generators of compound values (those defined in terms of other generators).