From 8bc767bfd7c83e26d6e4dcaa2d780a5e8c120a89 Mon Sep 17 00:00:00 2001 From: Michael Straka Date: Tue, 13 Jul 2021 14:19:27 -0700 Subject: [PATCH 1/4] do not write .params in combine --- phase2-cli/src/combine.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phase2-cli/src/combine.rs b/phase2-cli/src/combine.rs index 1998d2c9..edaff432 100644 --- a/phase2-cli/src/combine.rs +++ b/phase2-cli/src/combine.rs @@ -84,11 +84,11 @@ pub fn combine( .expect("should have written combined"); std::fs::write(combined_filename, &combined_contents).expect("should have written combined file"); - let mut combined_parameters_contents = vec![]; + /*let mut combined_parameters_contents = vec![]; combined .params .serialize_uncompressed(&mut combined_parameters_contents) .expect("should have serialized combined parameters"); std::fs::write(format!("{}.params", combined_filename), &combined_parameters_contents) - .expect("should have written combined parameters file"); + .expect("should have written combined parameters file");*/ } From 53705cfe8883e16f9e55e9e4ee6fa132ddb84849 Mon Sep 17 00:00:00 2001 From: Michael Straka Date: Tue, 13 Jul 2021 14:31:24 -0700 Subject: [PATCH 2/4] removed comment --- phase2-cli/src/combine.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/phase2-cli/src/combine.rs b/phase2-cli/src/combine.rs index edaff432..6300bb30 100644 --- a/phase2-cli/src/combine.rs +++ b/phase2-cli/src/combine.rs @@ -1,7 +1,7 @@ use phase2::parameters::{verify_transcript, MPCParameters}; use setup_utils::{print_hash, CheckForCorrectness, SubgroupCheckMode, UseCompression}; -use algebra::{CanonicalSerialize, BW6_761}; +use algebra::BW6_761; use std::fs::File; use std::io::{BufRead, BufReader}; @@ -83,12 +83,4 @@ pub fn combine( .write(&mut combined_contents, COMBINED_IS_COMPRESSED) .expect("should have written combined"); std::fs::write(combined_filename, &combined_contents).expect("should have written combined file"); - - /*let mut combined_parameters_contents = vec![]; - combined - .params - .serialize_uncompressed(&mut combined_parameters_contents) - .expect("should have serialized combined parameters"); - std::fs::write(format!("{}.params", combined_filename), &combined_parameters_contents) - .expect("should have written combined parameters file");*/ } From c531c243becb59ce5a8e133a46d73fd003ea65c4 Mon Sep 17 00:00:00 2001 From: Michael Straka Date: Tue, 13 Jul 2021 14:49:56 -0700 Subject: [PATCH 3/4] changed new challenge filename suffix --- phase2-cli/src/new_challenge.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phase2-cli/src/new_challenge.rs b/phase2-cli/src/new_challenge.rs index b192d73a..9224137a 100644 --- a/phase2-cli/src/new_challenge.rs +++ b/phase2-cli/src/new_challenge.rs @@ -86,12 +86,12 @@ pub fn new_challenge( chunk .write(&mut serialized_chunk, COMPRESS_CONTRIBUTE_INPUT) .expect("unable to write chunk"); - std::fs::File::create(format!("{}.{}", challenge_filename, i)) + std::fs::File::create(format!("{}_{}", challenge_filename, i)) .expect("unable to open new challenge hash file") .write_all(&serialized_chunk) .expect("unable to write serialized mpc parameters"); challenge_list_file - .write(format!("{}.{}\n", challenge_filename, i).as_bytes()) + .write(format!("{}_{}\n", challenge_filename, i).as_bytes()) .expect("unable to write challenge list"); } From 7da1b3c7e541cbe59b3fc4b4ff7a420a81491ba1 Mon Sep 17 00:00:00 2001 From: Michael Straka Date: Tue, 13 Jul 2021 15:43:20 -0700 Subject: [PATCH 4/4] reversed previous change --- phase2-cli/src/new_challenge.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phase2-cli/src/new_challenge.rs b/phase2-cli/src/new_challenge.rs index 9224137a..b192d73a 100644 --- a/phase2-cli/src/new_challenge.rs +++ b/phase2-cli/src/new_challenge.rs @@ -86,12 +86,12 @@ pub fn new_challenge( chunk .write(&mut serialized_chunk, COMPRESS_CONTRIBUTE_INPUT) .expect("unable to write chunk"); - std::fs::File::create(format!("{}_{}", challenge_filename, i)) + std::fs::File::create(format!("{}.{}", challenge_filename, i)) .expect("unable to open new challenge hash file") .write_all(&serialized_chunk) .expect("unable to write serialized mpc parameters"); challenge_list_file - .write(format!("{}_{}\n", challenge_filename, i).as_bytes()) + .write(format!("{}.{}\n", challenge_filename, i).as_bytes()) .expect("unable to write challenge list"); }