Move weight constants in the Weight type
#1826
Merged
Conversation
This file contains hidden or 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
54aff43 to
23ca71f
Compare
RCasatta
commented
May 1, 2023
bitcoin/src/merkle_tree/block.rs
Outdated
| @@ -276,7 +276,7 @@ impl PartialMerkleTree { | |||
| return Err(NoTransactions); | |||
| }; | |||
| // check for excessively high numbers of transactions | |||
| if self.num_transactions > MAX_BLOCK_WEIGHT / MIN_TRANSACTION_WEIGHT { | |||
| if self.num_transactions as u64 > (Weight::MAX_BLOCK / Weight::MIN_TRANSACTION.to_wu()).to_wu() { | |||
There was a problem hiding this comment.
impl Div<Weight> for Weight could have been useful here...
There was a problem hiding this comment.
Why it's not Weight::MAX_BLOCK.to_wu() / Weight::MIN_TRANSACTION.to_wu()?
Anyway, I wouldn't mind having Div since it properly returns unitless number but it might look a bit strange.
There was a problem hiding this comment.
Why it's not Weight::MAX_BLOCK.to_wu() / Weight::MIN_TRANSACTION.to_wu()?
Yeah that could have been better, I went for the Div impl in the latest version
deprecate constants::MAX_BLOCK_WEIGHT and constants::MIN_TRANSACTION_WEIGHT to nicely redirect users to the constants in the Weight type
Kixunil
approved these changes
May 1, 2023
|
Note that if we're doing |
apoelstra
approved these changes
May 1, 2023
|
ACK :) |
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.
deprecate constants::MAX_BLOCK_WEIGHT and constants::MIN_TRANSACTION_WEIGHT to nicely redirect users to the constants in the Weight type