-
Notifications
You must be signed in to change notification settings - Fork 86
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
Shelley forge should respect max block size override #3238
Merged
iohk-bors
merged 7 commits into
master
from
EncodePanda/3225-max-tx-capacity-override-included-in-shelley
Jul 5, 2021
Merged
Shelley forge should respect max block size override #3238
iohk-bors
merged 7 commits into
master
from
EncodePanda/3225-max-tx-capacity-override-included-in-shelley
Jul 5, 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
nfrisby
reviewed
Jul 2, 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.
A few last bits to tie up.
EncodePanda
force-pushed
the
EncodePanda/3225-max-tx-capacity-override-included-in-shelley
branch
2 times, most recently
from
July 2, 2021 14:19
6596cb1
to
4b456e1
Compare
nfrisby
reviewed
Jul 4, 2021
ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Ledger/Mempool.hs
Outdated
Show resolved
Hide resolved
nfrisby
approved these changes
Jul 4, 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.
Approving; there are just a couple minor things left to do before merging:
- update the comments around
MaxTxCapacityOverride
- remove a couple of extra newlines
By making a MaxTxCapacityOverride polymorphic on the block we open up possibility to use when calculating max capacity for Alonzo block (whose Measure is product of ByteSize and ExUnits) It also allows us to define one for the HardForkBlock, which allows to unify the usage of TxLimits in both Byron and Shelley while forging blocks. In a process we had to introduce Overrides data family because the MaxTxCapacityOverride of HardForkBlock had do be different (NP of individual MaxTxCapacityOverrides) then for normal blocks (where it is just a Measure). In the process of making those changes TxLimits was moved from Ouroboros.Consensus.Shelley.TxLimits to Ouroboros.Consensus.Mempool.TxLimits
EncodePanda
force-pushed
the
EncodePanda/3225-max-tx-capacity-override-included-in-shelley
branch
from
July 5, 2021 09:04
4b456e1
to
e244a30
Compare
bors merge |
Build succeeded: |
iohk-bors
bot
deleted the
EncodePanda/3225-max-tx-capacity-override-included-in-shelley
branch
July 5, 2021 10:34
This was referenced Jul 5, 2021
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.
Addresses: #3237 and #3225
Also #3239 was fixed in 4b456e1