Qortal/pirate-librustzcash
3
0
Fork 0
mirror of https://github.com/Qortal/pirate-librustzcash.git synced 2025-01-30 23:42:13 +00:00
Code Issues Projects Releases Wiki Activity

Renames after moves

Browse Source
This commit is contained in:
Jack Grigg 2019-11-13 19:21:47 +00:00
parent 8d967c8609
commit 8d6f882510
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ impl TransparentInputs {
Ok(()) Ok(())
} }
fn input_sum(&self) -> Amount { fn value_sum(&self) -> Amount {
#[cfg(feature = "transparent-inputs")] #[cfg(feature = "transparent-inputs")]
{ {
self.inputs self.inputs
@ -282,7 +282,7 @@ pub struct Builder<R: RngCore + CryptoRng> {
anchor: Option<Fr>, anchor: Option<Fr>,
spends: Vec<SpendDescriptionInfo>, spends: Vec<SpendDescriptionInfo>,
outputs: Vec<SaplingOutput>, outputs: Vec<SaplingOutput>,
legacy: TransparentInputs, transparent_inputs: TransparentInputs,
change_address: Option<(OutgoingViewingKey, PaymentAddress<Bls12>)>, change_address: Option<(OutgoingViewingKey, PaymentAddress<Bls12>)>,
} }
@ -322,7 +322,7 @@ impl<R: RngCore + CryptoRng> Builder<R> {
anchor: None, anchor: None,
spends: vec![], spends: vec![],
outputs: vec![], outputs: vec![],
legacy: TransparentInputs::default(), transparent_inputs: TransparentInputs::default(),
change_address: None, change_address: None,
} }
} }
@ -389,7 +389,7 @@ impl<R: RngCore + CryptoRng> Builder<R> {
utxo: OutPoint, utxo: OutPoint,
coin: TxOut, coin: TxOut,
) -> Result<(), Error> { ) -> 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. /// Adds a transparent address to send funds to.
@ -439,7 +439,7 @@ impl<R: RngCore + CryptoRng> Builder<R> {
// //
// Valid change // 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 - self
.mtx .mtx
.vout .vout
@ -646,7 +646,7 @@ impl<R: RngCore + CryptoRng> Builder<R> {
); );
// Transparent signatures // Transparent signatures
self.legacy self.transparent_inputs
.apply_signatures(&mut self.mtx, consensus_branch_id); .apply_signatures(&mut self.mtx, consensus_branch_id);
Ok(( Ok((