From 8d6f882510613a1cd5daa05837a19d749316de49 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 13 Nov 2019 19:21:47 +0000 Subject: [PATCH] Renames after moves --- zcash_primitives/src/transaction/builder.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs index d350514..00bdc24 100644 --- a/zcash_primitives/src/transaction/builder.rs +++ b/zcash_primitives/src/transaction/builder.rs @@ -195,7 +195,7 @@ impl TransparentInputs { Ok(()) } - fn input_sum(&self) -> Amount { + fn value_sum(&self) -> Amount { #[cfg(feature = "transparent-inputs")] { self.inputs @@ -282,7 +282,7 @@ pub struct Builder { anchor: Option, spends: Vec, outputs: Vec, - legacy: TransparentInputs, + transparent_inputs: TransparentInputs, change_address: Option<(OutgoingViewingKey, PaymentAddress)>, } @@ -322,7 +322,7 @@ impl Builder { anchor: None, spends: vec![], outputs: vec![], - legacy: TransparentInputs::default(), + transparent_inputs: TransparentInputs::default(), change_address: None, } } @@ -389,7 +389,7 @@ impl Builder { utxo: OutPoint, coin: TxOut, ) -> Result<(), Error> { - self.legacy.push(&mut self.mtx, sk, utxo, coin) + self.transparent_inputs.push(&mut self.mtx, sk, utxo, coin) } /// Adds a transparent address to send funds to. @@ -439,7 +439,7 @@ impl Builder { // // Valid change - let change = self.mtx.value_balance - self.fee + self.legacy.input_sum() + let change = self.mtx.value_balance - self.fee + self.transparent_inputs.value_sum() - self .mtx .vout @@ -646,7 +646,7 @@ impl Builder { ); // Transparent signatures - self.legacy + self.transparent_inputs .apply_signatures(&mut self.mtx, consensus_branch_id); Ok((