logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-15 04:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Nicholas Ward 2022-07-07 09:28:34 -07:00
parent c3e7652763
commit b467a13d91
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
evm/src/all_stark.rs
View File

@ -195,7 +195,7 @@ mod tests {
num_memory_ops: usize,
memory_stark: &MemoryStark<F, D>,
rng: &mut R,
) -> Vec<PolynomialValues<F>> {
) -> (Vec<PolynomialValues<F>>, usize) {
let memory_ops = generate_random_memory_ops(num_memory_ops, rng);
memory_stark.generate_trace(memory_ops)
}
@ -327,6 +327,8 @@ mod tests {
let keccak_trace = make_keccak_trace(num_keccak_perms, &keccak_stark, &mut rng);
let logic_trace = make_logic_trace(num_logic_rows, &logic_stark, &mut rng);
let mem_trace = make_memory_trace(num_memory_ops, &memory_stark, &mut rng);
let mut memory_trace = mem_trace.0;
let num_memory_ops = mem_trace.1;
let cpu_trace = make_cpu_trace(
num_keccak_perms,
num_logic_rows,

7
evm/src/memory/memory_stark.rs
View File

@ -226,7 +226,7 @@ pub fn generate_range_check_value<F: RichField>(
range_check.push(F::ZERO);
(range_check, max_timestamp_diff.try_into().unwrap())
(range_check, max_timestamp_diff as usize)
}
impl<F: RichField + Extendable<D>, const D: usize> MemoryStark<F, D> {
@ -352,7 +352,7 @@ impl<F: RichField + Extendable<D>, const D: usize> MemoryStark<F, D> {
}
}
pub fn generate_trace(&self, memory_ops: Vec<MemoryOp<F>>) -> Vec<PolynomialValues<F>> {
pub fn generate_trace(&self, memory_ops: Vec<MemoryOp<F>>) -> (Vec<PolynomialValues<F>>, usize) {
let mut timing = TimingTree::new("generate trace", log::Level::Debug);
// Generate the witness.
@ -361,6 +361,7 @@ impl<F: RichField + Extendable<D>, const D: usize> MemoryStark<F, D> {
"generate trace rows",
self.generate_trace_rows(memory_ops)
);
let num_ops = trace_rows.len();
let trace_polys = timed!(
&mut timing,
@ -369,7 +370,7 @@ impl<F: RichField + Extendable<D>, const D: usize> MemoryStark<F, D> {
);
timing.print();
trace_polys
(trace_polys, num_ops)
}
}