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

Apply suggestions from code review 

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Kris Nuttycombe 2021-06-08 07:02:52 -06:00 committed by GitHub
parent f70285d243
commit eb3d01aa6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,7 +225,7 @@ impl TxVersion {
BranchId::Sapling | BranchId::Blossom | BranchId::Heartwood | BranchId::Canopy => {
TxVersion::Sapling
}
BranchId::Nu5 => TxVersion::Zip225, //TEMPORARY WORKAROUND
BranchId::Nu5 => TxVersion::Zip225,
#[cfg(feature = "zfuture")]
BranchId::ZFuture => TxVersion::ZFuture,
}
@ -862,7 +862,7 @@ impl Transaction {
if self.orchard_bundle.is_some() {
return Err(io::Error::new(
io::ErrorKind::InvalidInput,
"Orchard components may not be present when serializing to the V4 transaction format."
"Orchard components cannot be present when serializing to the V4 transaction format."
));
}
@ -882,6 +882,12 @@ impl Transaction {
}
pub fn write_v5<W: Write>(&self, mut writer: W) -> io::Result<()> {
if self.sprout_bundle.is_some() {
return Err(io::Error::new(
io::ErrorKind::InvalidInput,
"Sprout components cannot be present when serializing to the V5 transaction format.",
));
}
self.write_v5_header(&mut writer)?;
self.write_transparent(&mut writer)?;
self.write_v5_sapling(&mut writer)?;
@ -933,7 +939,7 @@ impl Transaction {
|w, e| w.write_all(e),
)?;
if !bundle.shielded_spends.is_empty() || !bundle.shielded_outputs.is_empty() {
if !(bundle.shielded_spends.is_empty() && bundle.shielded_outputs.is_empty()) {
bundle.authorization.binding_sig.write(&mut writer)?;
}
} else {