Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Daira-Emma Hopwood <daira@jacaranda.org>
  • Loading branch information
nuttycom and daira authored Oct 25, 2024
1 parent f2b51cf commit 2cc6775
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion zcash_client_backend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ and this library adheres to Rust's notion of
- `SplitPolicy`
- `StandardFeeRule` has been moved here from `zcash_primitives::fees`. Relative
to that type, the deprecated `PreZip313` and `Zip313` variants have been
removed
removed.
- `zip317::MultiOutputChangeStrategy`
- `standard::MultiOutputChangeStrategy`
- A new feature flag, `non-standard-fees`, has been added. This flag is now
Expand Down
2 changes: 1 addition & 1 deletion zcash_primitives/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ and this library adheres to Rust's notion of
### Removed
- `zcash_primitives::transaction::fees`:
- `StandardFeeRule` itself has been removed; it was not used in this crate.
Is use in `zcash_client_backend` has been replaced with
Its use in `zcash_client_backend` has been replaced with
`zcash_client_backend::fees::StandardFeeRule`.
- `fixed::FeeRule::standard`. This constructor was misleadingly named: using a
fixed fee does not conform to any current Zcash standard. To calculate the
Expand Down
8 changes: 8 additions & 0 deletions zcash_primitives/src/transaction/fees/zip317.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ impl FeeRule {

/// Construct a new FeeRule instance with the specified parameter values.
///
/// Using this fee rule with
/// ```compile_fail
/// marginal_fee < 5000 || grace_actions < 2 \
/// || p2pkh_standard_input_size > P2PKH_STANDARD_INPUT_SIZE \
/// || p2pkh_standard_output_size > P2PKH_STANDARD_OUTPUT_SIZE
/// ```
/// violates ZIP 317, and might cause transactions built with it to fail.
///
/// Returns `None` if either `p2pkh_standard_input_size` or `p2pkh_standard_output_size` are
/// zero.
#[cfg(feature = "non-standard-fees")]
Expand Down

0 comments on commit 2cc6775

Please sign in to comment.