update cargo lock, fix merge

This commit is contained in:
poma 2020-04-28 11:23:57 +03:00
parent 1b5decdf67
commit 978c3c183b
No known key found for this signature in database
GPG Key ID: BA20CB01FE165657
2 changed files with 774 additions and 2 deletions

772
phase2/Cargo.lock generated

File diff suppressed because it is too large Load Diff

@ -27,7 +27,7 @@ fn main() {
let response_filename = &args[2];
let circuit_power = args[3].parse().expect("could not parse circuit power");
let batch_size = args[4].parse().expect("could not parse batch size");
let beacon_hash = args[5];
let beacon_hash = &args[5];
let parameters = CeremonyParams::<Bn256>::new(circuit_power, batch_size);
@ -48,7 +48,7 @@ fn main() {
use rand::chacha::ChaChaRng;
use rand::SeedableRng;
let mut cur_hash: [u8; 32] = hex!(beacon_hash);
let mut cur_hash = hex::decode(beacon_hash).unwrap();
// Performs 2^n hash iterations over it
const N: u64 = 10;