From 170397b5a5ebfa2f6823bb631ca7b248f17823ac Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Tue, 17 Apr 2018 14:22:35 -0600 Subject: [PATCH] Apply rustfmt --- src/rustzcash.rs | 102 +++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 56 deletions(-) diff --git a/src/rustzcash.rs b/src/rustzcash.rs index 8c69c50..649a021 100644 --- a/src/rustzcash.rs +++ b/src/rustzcash.rs @@ -1,47 +1,23 @@ -extern crate libc; -extern crate sapling_crypto; -extern crate pairing; extern crate bellman; +extern crate libc; +extern crate pairing; +extern crate sapling_crypto; #[macro_use] extern crate lazy_static; -use pairing::{ - BitIterator, - PrimeFieldRepr, - PrimeField, - bls12_381::{ - Bls12, - Fr, - FrRepr - } -}; +use pairing::{BitIterator, PrimeField, PrimeFieldRepr, bls12_381::{Bls12, Fr, FrRepr}}; -use sapling_crypto::{ - jubjub::JubjubBls12, - pedersen_hash::{ - pedersen_hash, - Personalization - } -}; +use sapling_crypto::{jubjub::JubjubBls12, pedersen_hash::{pedersen_hash, Personalization}}; -use bellman::{ - groth16::{ - Parameters, - PreparedVerifyingKey, - VerifyingKey, - prepare_verifying_key - } -}; +use bellman::groth16::{prepare_verifying_key, Parameters, PreparedVerifyingKey, VerifyingKey}; -use libc::{uint64_t, size_t, c_uchar, c_char}; +use libc::{c_char, c_uchar, size_t, uint64_t}; use std::ffi::CStr; use std::fs::File; lazy_static! { - static ref JUBJUB: JubjubBls12 = { - JubjubBls12::new() - }; + static ref JUBJUB: JubjubBls12 = { JubjubBls12::new() }; } static mut SAPLING_SPEND_VK: Option> = None; @@ -56,24 +32,37 @@ static mut SPROUT_GROTH16_PARAMS_PATH: Option = None; pub extern "system" fn librustzcash_init_zksnark_params( spend_path: *const c_char, output_path: *const c_char, - sprout_path: *const c_char -) -{ + sprout_path: *const c_char, +) { // These should be valid CStr's, but the decoding may fail on Windows // so we may need to use OSStr or something. - let spend_path = unsafe { CStr::from_ptr(spend_path) }.to_str().expect("parameter path encoding error").to_string(); - let output_path = unsafe { CStr::from_ptr(output_path) }.to_str().expect("parameter path encoding error").to_string(); - let sprout_path = unsafe { CStr::from_ptr(sprout_path) }.to_str().expect("parameter path encoding error").to_string(); + let spend_path = unsafe { CStr::from_ptr(spend_path) } + .to_str() + .expect("parameter path encoding error") + .to_string(); + let output_path = unsafe { CStr::from_ptr(output_path) } + .to_str() + .expect("parameter path encoding error") + .to_string(); + let sprout_path = unsafe { CStr::from_ptr(sprout_path) } + .to_str() + .expect("parameter path encoding error") + .to_string(); // Load from each of the paths let mut spend_fs = File::open(spend_path).expect("couldn't load Sapling spend parameters file"); - let mut output_fs = File::open(output_path).expect("couldn't load Sapling output parameters file"); - let mut sprout_fs = File::open(&sprout_path).expect("couldn't load Sprout groth16 parameters file"); + let mut output_fs = + File::open(output_path).expect("couldn't load Sapling output parameters file"); + let mut sprout_fs = + File::open(&sprout_path).expect("couldn't load Sprout groth16 parameters file"); // Deserialize params - let spend_params = Parameters::::read(&mut spend_fs, false).expect("couldn't deserialize Sapling spend parameters file"); - let output_params = Parameters::::read(&mut output_fs, false).expect("couldn't deserialize Sapling spend parameters file"); - let sprout_vk = VerifyingKey::::read(&mut sprout_fs).expect("couldn't deserialize Sprout Groth16 verifying key"); + let spend_params = Parameters::::read(&mut spend_fs, false) + .expect("couldn't deserialize Sapling spend parameters file"); + let output_params = Parameters::::read(&mut output_fs, false) + .expect("couldn't deserialize Sapling spend parameters file"); + let sprout_vk = VerifyingKey::::read(&mut sprout_fs) + .expect("couldn't deserialize Sprout Groth16 verifying key"); // Prepare verifying keys let spend_vk = prepare_verifying_key(&spend_params.vk); @@ -94,10 +83,7 @@ pub extern "system" fn librustzcash_init_zksnark_params( } #[no_mangle] -pub extern "system" fn librustzcash_tree_uncommitted( - result: *mut [c_uchar; 32] -) -{ +pub extern "system" fn librustzcash_tree_uncommitted(result: *mut [c_uchar; 32]) { let tmp = sapling_crypto::primitives::Note::::uncommitted().into_repr(); // Should be okay, caller is responsible for ensuring the pointer @@ -113,8 +99,7 @@ pub extern "system" fn librustzcash_merkle_hash( a: *const [c_uchar; 32], b: *const [c_uchar; 32], result: *mut [c_uchar; 32], -) -{ +) { let mut a_repr = FrRepr::default(); let mut b_repr = FrRepr::default(); @@ -138,14 +123,17 @@ pub extern "system" fn librustzcash_merkle_hash( for (a, b) in rhs.iter_mut().rev().zip(BitIterator::new(b_repr)) { *a = b; } - + let tmp = pedersen_hash::( Personalization::MerkleTree(depth), - lhs.iter().map(|&x| x) + lhs.iter() + .map(|&x| x) .take(Fr::NUM_BITS as usize) .chain(rhs.iter().map(|&x| x).take(Fr::NUM_BITS as usize)), - &JUBJUB - ).into_xy().0.into_repr(); + &JUBJUB, + ).into_xy() + .0 + .into_repr(); // Should be okay, caller is responsible for ensuring the pointer // is a valid pointer to 32 bytes that can be mutated. @@ -158,12 +146,14 @@ pub extern "system" fn librustzcash_merkle_hash( /// as a temporary mechanism for introducing Rust into /// Zcash. #[no_mangle] -pub extern "system" fn librustzcash_xor(a: uint64_t, b: uint64_t) -> uint64_t -{ +pub extern "system" fn librustzcash_xor(a: uint64_t, b: uint64_t) -> uint64_t { a ^ b } #[test] fn test_xor() { - assert_eq!(librustzcash_xor(0x0f0f0f0f0f0f0f0f, 0x1111111111111111), 0x1e1e1e1e1e1e1e1e); + assert_eq!( + librustzcash_xor(0x0f0f0f0f0f0f0f0f, 0x1111111111111111), + 0x1e1e1e1e1e1e1e1e + ); }