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

Remove unnecessary references

This commit is contained in:
Jack Grigg 2020-10-30 13:40:26 +00:00
parent 88474c71c7
commit 44cbc6cc6d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zcash_primitives/src/merkle_tree.rs
View File

@ -1034,7 +1034,7 @@ mod tests {
if let Some(leaf) = leaf {
let path = witness.path().expect("should be able to create a path");
let expected = MerklePath::from_slice_with_depth(
&mut hex::decode(paths[paths_i]).unwrap(),
&hex::decode(paths[paths_i]).unwrap(),
TESTING_DEPTH,
)
.unwrap();

2
zcash_primitives/src/redjubjub.rs
View File

@ -188,7 +188,7 @@ pub fn batch_verify<'a, R: RngCore>(
c.mul_assign(&z);
acc = acc + r + (&entry.vk.0 * c) + (p_g * s);
acc = acc + r + (entry.vk.0 * c) + (p_g * s);
}
acc.mul_by_cofactor().is_identity().into()

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

@ -207,7 +207,7 @@ impl TransparentInputs {
use ripemd160::Ripemd160;
use sha2::{Digest, Sha256};
if &hash[..] != &Ripemd160::digest(&Sha256::digest(&pubkey))[..] {
if hash[..] != Ripemd160::digest(&Sha256::digest(&pubkey))[..] {
return Err(Error::InvalidAddress);
}
}

2
zcash_primitives/src/util.rs
View File

@ -23,7 +23,7 @@ pub fn generate_random_rseed<P: consensus::Parameters, R: RngCore + CryptoRng>(
) -> Rseed {
if params.is_nu_active(NetworkUpgrade::Canopy, height) {
let mut buffer = [0u8; 32];
&rng.fill_bytes(&mut buffer);
rng.fill_bytes(&mut buffer);
Rseed::AfterZip212(buffer)
} else {
Rseed::BeforeZip212(jubjub::Fr::random(rng))

14
zcash_proofs/src/circuit/ecc.rs
View File

@ -326,7 +326,7 @@ impl EdwardsPoint {
let mut t1 = bls12_381::Scalar::one();
t1.add_assign(c.get_value().get()?);
let res = t1.invert().map(|t1| t0 * &t1);
let res = t1.invert().map(|t1| t0 * t1);
if bool::from(res.is_some()) {
Ok(res.unwrap())
} else {
@ -352,7 +352,7 @@ impl EdwardsPoint {
let mut t1 = bls12_381::Scalar::one();
t1.sub_assign(c.get_value().get()?);
let res = t1.invert().map(|t1| t0 * &t1);
let res = t1.invert().map(|t1| t0 * t1);
if bool::from(res.is_some()) {
Ok(res.unwrap())
} else {
@ -427,7 +427,7 @@ impl EdwardsPoint {
let mut t1 = bls12_381::Scalar::one();
t1.add_assign(c.get_value().get()?);
let ret = t1.invert().map(|t1| t0 * &t1);
let ret = t1.invert().map(|t1| t0 * t1);
if bool::from(ret.is_some()) {
Ok(ret.unwrap())
} else {
@ -452,7 +452,7 @@ impl EdwardsPoint {
let mut t1 = bls12_381::Scalar::one();
t1.sub_assign(c.get_value().get()?);
let ret = t1.invert().map(|t1| t0 * &t1);
let ret = t1.invert().map(|t1| t0 * t1);
if bool::from(ret.is_some()) {
Ok(ret.unwrap())
} else {
@ -489,7 +489,7 @@ impl MontgomeryPoint {
let mut t0 = *self.x.get_value().get()?;
t0.mul_assign(MONTGOMERY_SCALE);
let ret = self.y.get_value().get()?.invert().map(|invy| t0 * &invy);
let ret = self.y.get_value().get()?.invert().map(|invy| t0 * invy);
if bool::from(ret.is_some()) {
Ok(ret.unwrap())
} else {
@ -511,7 +511,7 @@ impl MontgomeryPoint {
t0.sub_assign(&bls12_381::Scalar::one());
t1.add_assign(&bls12_381::Scalar::one());
let ret = t1.invert().map(|t1| t0 * &t1);
let ret = t1.invert().map(|t1| t0 * t1);
if bool::from(ret.is_some()) {
Ok(ret.unwrap())
} else {
@ -552,7 +552,7 @@ impl MontgomeryPoint {
let mut d = *other.x.get_value().get()?;
d.sub_assign(self.x.get_value().get()?);
let ret = d.invert().map(|d| n * &d);
let ret = d.invert().map(|d| n * d);
if bool::from(ret.is_some()) {
Ok(ret.unwrap())
} else {