Skip to content

Commit

Permalink
fix: clippy and UT
Browse files Browse the repository at this point in the history
  • Loading branch information
eigmax committed Jun 20, 2024
1 parent dd746a6 commit 1ae2657
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
11 changes: 5 additions & 6 deletions recursion/src/compressor12/compressor12_exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ mod test {

#[test]
fn test_write_and_read_exec_file() {
let file_path = String::from("/tmp/test_write_and_read_exec_file.txt");

let target_adds = vec![
// PlonkAdd()
];
Expand All @@ -148,11 +146,12 @@ mod test {
];

let out = Vec::new();
let buf = BufWriter::new(out);
write_exec_file(buf, &target_adds, &target_s_map).unwrap();
let mut buf = BufWriter::new(out);
write_exec_file(&mut buf, &target_adds, &target_s_map).unwrap();
let input = buf.buffer();

let file = File::open(file_path).unwrap();
let (adds_len, _s_map_column_len, _adds, _s_map) = read_exec_file(file).unwrap();
let reader = std::io::Cursor::new(input);
let (adds_len, _s_map_column_len, _adds, _s_map) = read_exec_file(reader).unwrap();

assert_eq!(adds_len, target_adds.len());
}
Expand Down
6 changes: 3 additions & 3 deletions recursion/src/compressor12/compressor12_setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ pub fn setup(
let const_writer = std::fs::File::create(const_file)?;
res.const_pols.save(const_writer)?;

let file_writer =
let mut file_writer =
File::create(exec_file).map_err(|e| anyhow!("Create {}, {:?}", exec_file, e))?;
// 4. construct and save ExecFile: plonk additions + sMap -> BigUint64Array
write_exec_file(file_writer, &res.plonk_additions, &res.s_map)?;
write_exec_file(&mut file_writer, &res.plonk_additions, &res.s_map)?;

Ok(())
}

// construct and save ExecFile: plonk additions + sMap -> BigUint64Array
pub(super) fn write_exec_file<W: std::io::Write>(
exec_file_writer: W,
exec_file_writer: &mut W,
adds: &[PlonkAdd],
s_map: &[Vec<u64>],
) -> Result<()> {
Expand Down
6 changes: 3 additions & 3 deletions recursion/src/io_utils.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use anyhow::Result;

pub fn write_vec_to_file<W: std::io::Write>(mut writer: W, vec: &[u64]) -> Result<()> {
pub fn write_vec_to_file<W: std::io::Write>(writer: &mut W, vec: &[u64]) -> Result<()> {
let input = serde_json::to_string(&vec)?;
write!(writer, "{}", input)?;
Ok(())
Expand All @@ -20,8 +20,8 @@ mod test {
fn test_read_write_vec_with_file() -> Result<()> {
let target: Vec<u64> = vec![1, 2, 3, 4, 5, 1111112121, 2667022304383014929];
let path = String::from("/tmp/vec_data.txt");
let file = std::fs::File::create(path.clone()).unwrap();
write_vec_to_file(file, &target)?;
let mut file = std::fs::File::create(path.clone()).unwrap();
write_vec_to_file(&mut file, &target)?;

let file = std::fs::File::open(path).unwrap();
let actual = read_vec_from_file(file)?;
Expand Down

0 comments on commit 1ae2657

Please sign in to comment.