Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lispc committed Jun 7, 2024
1 parent e703d47 commit 3c5650c
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 21 deletions.
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions bin/src/trace_prover.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use clap::Parser;
use integration::test_util::prove_and_verify_chunk;
use prover::utils::init_env_and_log;
use integration::test_util::{load_chunk, prove_and_verify_chunk};
use prover::{utils::init_env_and_log, ChunkProvingTask};
use std::env;

#[derive(Parser, Debug)]
Expand Down Expand Up @@ -28,11 +28,16 @@ fn main() {
log::info!("Initialized ENV and created output-dir {output_dir}");

let args = Args::parse();

let traces = load_chunk(&args.trace_path).1;
prover::eth_types::constants::set_scroll_block_constants_with_trace(&traces[0]);
let chunk = ChunkProvingTask::from(traces);
prove_and_verify_chunk(
&args.trace_path,
Some("test"),
chunk,
Some("0"), // same with `make test-chunk-prove`, to load vk
&args.params_path,
&args.assets_path,
&output_dir,
);
log::info!("chunk prove done");
}
7 changes: 2 additions & 5 deletions integration/src/test_util/prove.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use crate::test_util::load_chunk;

use super::PARAMS_DIR;
use prover::{
aggregator::{Prover as BatchProver, Verifier as BatchVerifier},
Expand All @@ -18,21 +16,20 @@ pub fn new_batch_prover(output_dir: &str) -> BatchProver {
}

pub fn prove_and_verify_chunk(
trace_path: &str,
chunk: ChunkProvingTask,
chunk_identifier: Option<&str>,
params_path: &str,
assets_path: &str,
output_dir: &str,
) {
let traces = load_chunk(trace_path).1;

let mut prover = ChunkProver::from_dirs(params_path, assets_path);
log::info!("Constructed chunk prover");

let now = Instant::now();
let chunk_proof = prover
.gen_chunk_proof(
ChunkProvingTask::from(traces),
chunk,
chunk_identifier,
None,
Some(output_dir),
Expand Down
7 changes: 5 additions & 2 deletions integration/tests/chunk_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ use prover::utils::init_env_and_log;
#[cfg(feature = "prove_verify")]
#[test]
fn test_chunk_prove_verify() {
use integration::test_util::{prove_and_verify_chunk, trace_path_for_test};
use integration::test_util::{load_chunk, prove_and_verify_chunk, trace_path_for_test};
use prover::ChunkProvingTask;

let output_dir = init_env_and_log("chunk_tests");
log::info!("Initialized ENV and created output-dir {output_dir}");

let trace_path = trace_path_for_test();
prove_and_verify_chunk(&trace_path, None, PARAMS_DIR, ASSETS_DIR, &output_dir);
let traces = load_chunk(&trace_path).1;
let chunk = ChunkProvingTask::from(traces);
prove_and_verify_chunk(chunk, None, PARAMS_DIR, ASSETS_DIR, &output_dir);
}

0 comments on commit 3c5650c

Please sign in to comment.