Merge pull request #30 from str4d/sapling-api-cleanup

Sapling proving and verifying API
zcash · Jan 6, 2019 · f65c37e · f65c37e
2 parents c038717 + 1a1c775
commit f65c37e
Show file tree

Hide file tree

Showing 12 changed files with 721 additions and 488 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/librustzcash/Cargo.toml b/librustzcash/Cargo.toml
@@ -21,6 +21,7 @@ lazy_static = "1"
 byteorder = "1"
 rand = "0.4"
 sapling-crypto = { path = "../sapling-crypto" }
+zcash_proofs = { path = "../zcash_proofs" }
 zip32 = { path = "../zip32" }
 
 [dependencies.blake2-rfc]

diff --git a/librustzcash/src/equihash.rs b/librustzcash/src/equihash.rs
@@ -149,8 +149,7 @@ fn expand_array(vin: &[u8], bit_len: usize, byte_pad: usize) -> Vec<u8> {
                 vout[j + x] = ((
                     // Big-endian
                     acc_value >> (acc_bits + (8 * (out_width - x - 1)))
-                )
-                    & (
+                ) & (
                     // Apply bit_len_mask across byte boundaries
                     (bit_len_mask >> (8 * (out_width - x - 1))) & 0xFF
                 )) as u8;