Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: satisfy clippy #68

Merged
merged 1 commit into from
Jun 17, 2024
Merged

chore: satisfy clippy #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions chips/src/final_page/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ fn test_single_page(
trace_builder: &mut TraceCommitmentBuilder<BabyBearPoseidon2Config>,
partial_pk: &MultiStarkPartialProvingKey<BabyBearPoseidon2Config>,
) -> Result<(), VerificationError> {
let page_trace = final_page_chip.gen_page_trace::<BabyBearPoseidon2Config>(&page);
let page_trace = final_page_chip.gen_page_trace::<BabyBearPoseidon2Config>(page);
let page_prover_data = trace_builder.committer.commit(vec![page_trace.clone()]);

let aux_trace =
final_page_chip.gen_aux_trace::<BabyBearPoseidon2Config>(&page, range_checker.clone());
final_page_chip.gen_aux_trace::<BabyBearPoseidon2Config>(page, range_checker.clone());
let range_checker_trace = range_checker.generate_trace();

trace_builder.clear();
Expand All @@ -52,7 +52,7 @@ fn test_single_page(
let verifier = engine.verifier();

let mut challenger = engine.new_challenger();
let proof = prover.prove(&mut challenger, &partial_pk, main_trace_data, &pis);
let proof = prover.prove(&mut challenger, partial_pk, main_trace_data, &pis);

let mut challenger = engine.new_challenger();
verifier.verify(
Expand Down
17 changes: 8 additions & 9 deletions chips/src/page_read/page_controller/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ use rand::Rng;

type Val = BabyBear;

#[allow(clippy::too_many_arguments)]
fn load_page_test(
engine: &BabyBearPoseidon2Engine,
page_to_receive: &Vec<Vec<u32>>,
page_to_send: &Vec<Vec<u32>>,
page_to_receive: &[Vec<u32>],
page_to_send: &[Vec<u32>],
page_controller: &mut page_controller::PageController<BabyBearPoseidon2Config>,
page_requester: &DummyInteractionAir,
trace_builder: &mut TraceCommitmentBuilder<BabyBearPoseidon2Config>,
Expand All @@ -42,14 +43,14 @@ fn load_page_test(
.collect::<Vec<usize>>();

let (page_trace, prover_data) =
page_controller.load_page(&mut trace_builder.committer, page_to_receive.clone());
page_controller.load_page(&mut trace_builder.committer, page_to_receive.to_vec());

let requester_trace = RowMajorMatrix::new(
requests
.iter()
.flat_map(|i| {
page_controller.request(*i);
iter::once(1 as u32)
iter::once(1)
.chain(iter::once(*i as u32))
.chain(page_to_send[*i].clone())
})
Expand Down Expand Up @@ -81,18 +82,16 @@ fn load_page_test(
let verifier = engine.verifier();

let mut challenger = engine.new_challenger();
let proof = prover.prove(&mut challenger, &partial_pk, main_trace_data, &pis);
let proof = prover.prove(&mut challenger, partial_pk, main_trace_data, &pis);

let mut challenger = engine.new_challenger();
let result = verifier.verify(
verifier.verify(
&mut challenger,
partial_vk,
vec![&page_controller.page_read_chip.air, page_requester],
proof,
&pis,
);

result
)
}

#[test]
Expand Down
17 changes: 7 additions & 10 deletions chips/src/page_rw_checker/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn load_page_test(
engine: &BabyBearPoseidon2Engine,
page_init: &Page,
idx_decomp: usize,
ops: &Vec<Operation>,
ops: &[Operation],
page_controller: &mut page_controller::PageController<BabyBearPoseidon2Config>,
ops_sender: &DummyInteractionAir,
trace_builder: &mut TraceCommitmentBuilder<BabyBearPoseidon2Config>,
Expand All @@ -46,8 +46,8 @@ fn load_page_test(
assert!(page_height > 0);

let (page_traces, mut prover_data) = page_controller.load_page_and_ops(
&page_init,
ops.clone(),
page_init,
ops.to_vec(),
trace_degree,
&mut trace_builder.committer,
);
Expand Down Expand Up @@ -108,10 +108,10 @@ fn load_page_test(
let verifier = engine.verifier();

let mut challenger = engine.new_challenger();
let proof = prover.prove(&mut challenger, &partial_pk, main_trace_data, &pis);
let proof = prover.prove(&mut challenger, partial_pk, main_trace_data, &pis);

let mut challenger = engine.new_challenger();
let result = verifier.verify(
verifier.verify(
&mut challenger,
partial_vk,
vec![
Expand All @@ -123,9 +123,7 @@ fn load_page_test(
],
proof,
&pis,
);

result
)
}

#[test]
Expand Down Expand Up @@ -185,8 +183,7 @@ fn page_read_write_test() {
clks.sort();

let mut ops: Vec<Operation> = vec![];
for i in 0..num_ops {
let clk = clks[i];
for &clk in clks.iter() {
let idx = idx_data_map
.iter()
.nth(rng.gen::<usize>() % idx_data_map.len())
Expand Down
Loading