zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove needless bound on `FeeRule` from builder `Error` type.

This commit is contained in:
Kris Nuttycombe 2023-06-23 15:24:38 -06:00
parent 1b4017e0d1
commit 7fe02f0606
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zcash_primitives/src/transaction/builder.rs
View File

@ -277,12 +277,12 @@ impl<'a, P: consensus::Parameters, R: RngCore + CryptoRng> Builder<'a, P, R> {
/// ///
/// Returns an error if the given Merkle path does not have the required anchor for /// Returns an error if the given Merkle path does not have the required anchor for
/// the given note. /// the given note.
pub fn add_orchard_spend<FR: FeeRule>( pub fn add_orchard_spend<FeeError>(
&mut self, &mut self,
sk: orchard::keys::SpendingKey, sk: orchard::keys::SpendingKey,
note: orchard::Note, note: orchard::Note,
merkle_path: orchard::tree::MerklePath, merkle_path: orchard::tree::MerklePath,
) -> Result<(), Error<FR::Error>> { ) -> Result<(), Error<FeeError>> {
self.orchard_builder self.orchard_builder
.as_mut() .as_mut()
.ok_or(Error::OrchardAnchorNotAvailable)? .ok_or(Error::OrchardAnchorNotAvailable)?
@ -296,13 +296,13 @@ impl<'a, P: consensus::Parameters, R: RngCore + CryptoRng> Builder<'a, P, R> {
} }
/// Adds an Orchard recipient to the transaction. /// Adds an Orchard recipient to the transaction.
pub fn add_orchard_output<FR: FeeRule>( pub fn add_orchard_output<FeeError>(
&mut self, &mut self,
ovk: Option<orchard::keys::OutgoingViewingKey>, ovk: Option<orchard::keys::OutgoingViewingKey>,
recipient: orchard::Address, recipient: orchard::Address,
value: u64, value: u64,
memo: MemoBytes, memo: MemoBytes,
) -> Result<(), Error<FR::Error>> { ) -> Result<(), Error<FeeError>> {
self.orchard_builder self.orchard_builder
.as_mut() .as_mut()
.ok_or(Error::OrchardAnchorNotAvailable)? .ok_or(Error::OrchardAnchorNotAvailable)?