-
Notifications
You must be signed in to change notification settings - Fork 217
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adjust available UTxO to account for collateral inputs #2819
Merged
iohk-bors
merged 6 commits into
master
from
jonathanknowles/available-utxo-collateral-inputs
Aug 19, 2021
Merged
Adjust available UTxO to account for collateral inputs #2819
iohk-bors
merged 6 commits into
master
from
jonathanknowles/available-utxo-collateral-inputs
Aug 19, 2021
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
jonathanknowles
force-pushed
the
jonathanknowles/tx-collateral-inputs
branch
from
August 12, 2021 03:13
05b8429
to
55a7d0f
Compare
jonathanknowles
force-pushed
the
jonathanknowles/available-utxo-collateral-inputs
branch
from
August 12, 2021 03:14
ab2688d
to
65b05c9
Compare
jonathanknowles
force-pushed
the
jonathanknowles/tx-collateral-inputs
branch
from
August 12, 2021 03:21
55a7d0f
to
cd90151
Compare
jonathanknowles
force-pushed
the
jonathanknowles/available-utxo-collateral-inputs
branch
2 times, most recently
from
August 12, 2021 07:49
5915731
to
3aa5ae9
Compare
jonathanknowles
force-pushed
the
jonathanknowles/tx-collateral-inputs
branch
2 times, most recently
from
August 13, 2021 06:58
fd0c082
to
73203d5
Compare
Base automatically changed from
jonathanknowles/tx-collateral-inputs
to
master
August 16, 2021 06:13
jonathanknowles
force-pushed
the
jonathanknowles/available-utxo-collateral-inputs
branch
4 times, most recently
from
August 16, 2021 09:42
959242d
to
a7c9034
Compare
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]>
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]>
jonathanknowles
force-pushed
the
jonathanknowles/available-utxo-collateral-inputs
branch
from
August 17, 2021 08:22
a7c9034
to
d4c816f
Compare
jonathanknowles
changed the base branch from
master
to
jonathanknowles/sized-generators-shrinkers
August 17, 2021 08:22
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]>
Base automatically changed from
jonathanknowles/sized-generators-shrinkers
to
master
August 17, 2021 10:08
This commit makes the name of the test consistent with the name of the property.
jonathanknowles
force-pushed
the
jonathanknowles/available-utxo-collateral-inputs
branch
3 times, most recently
from
August 18, 2021 05:02
0c89302
to
fb7f597
Compare
jonathanknowles
force-pushed
the
jonathanknowles/available-utxo-collateral-inputs
branch
from
August 18, 2021 06:42
fb7f597
to
b9565a7
Compare
jonathanknowles
force-pushed
the
jonathanknowles/available-utxo-collateral-inputs
branch
from
August 18, 2021 08:40
5b2efc7
to
8675453
Compare
jonathanknowles
commented
Aug 18, 2021
jonathanknowles
commented
Aug 18, 2021
jonathanknowles
commented
Aug 18, 2021
@@ -128,7 +128,7 @@ spec = | |||
property prop_insert_delete | |||
it "prop_insert_lookup" $ | |||
property prop_insert_lookup | |||
it "prop_insert_lookup" $ | |||
it "prop_insert_size" $ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I discovered this while making PR #2829, but forgot to include it in that PR.
In response to review comments: #2819 (comment) #2819 (comment)
sevanspowell
approved these changes
Aug 19, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me!
bors r+ |
Build succeeded: |
iohk-bors
bot
deleted the
jonathanknowles/available-utxo-collateral-inputs
branch
August 19, 2021 08:02
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
ADP-1038
Comments
This PR:
availableUTxO
function to account for collateral inputs.availableUTxO
.availableUTxO
toavailableBalance
.