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

zcash_client_sqlite: Minor refactoring for improved debuggability & future Sapling flagging.

This commit is contained in:
Kris Nuttycombe 2024-03-10 16:42:14 -06:00 committed by Jack Grigg
parent 6601820a2a
commit 1028894324
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zcash_client_backend/src/fees/common.rs
View File

@ -106,8 +106,20 @@ where
#[cfg(not(feature = "orchard"))]
let (change_pool, sapling_change) = (ShieldedProtocol::Sapling, 1);
let sapling_input_count = sapling
.bundle_type()
.num_spends(sapling.inputs().len())
.map_err(ChangeError::BundleError)?;
let sapling_output_count = sapling
.bundle_type()
.num_outputs(
sapling.inputs().len(),
sapling.outputs().len() + sapling_change,
)
.map_err(ChangeError::BundleError)?;
#[cfg(feature = "orchard")]
let orchard_num_actions = orchard
let orchard_action_count = orchard
.bundle_type()
.num_actions(
orchard.inputs().len(),
@ -115,7 +127,7 @@ where
)
.map_err(ChangeError::BundleError)?;
#[cfg(not(feature = "orchard"))]
let orchard_num_actions = 0;
let orchard_action_count = 0;
let fee_amount = fee_rule
.fee_required(
@ -123,18 +135,9 @@ where
target_height,
transparent_inputs,
transparent_outputs,
sapling
.bundle_type()
.num_spends(sapling.inputs().len())
.map_err(ChangeError::BundleError)?,
sapling
.bundle_type()
.num_outputs(
sapling.inputs().len(),
sapling.outputs().len() + sapling_change,
)
.map_err(ChangeError::BundleError)?,
orchard_num_actions,
sapling_input_count,
sapling_output_count,
orchard_action_count,
)
.map_err(|fee_error| ChangeError::StrategyError(E::from(fee_error)))?;