logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-05-05 17:49:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
wborgeaud 2022-06-09 18:13:41 +02:00
parent afda9db00a
commit 4e848c77db
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
evm/src/all_stark.rs
View File

@ -63,7 +63,7 @@ mod tests {
use crate::config::StarkConfig; use crate::config::StarkConfig;
use crate::cpu; use crate::cpu;
use crate::cpu::cpu_stark::CpuStark; use crate::cpu::cpu_stark::CpuStark;
use crate::cross_table_lookup::CrossTableLookup; use crate::cross_table_lookup::{CrossTableLookup, TableWithColumns};
use crate::keccak::keccak_stark::{KeccakStark, INPUT_LIMBS, NUM_ROUNDS}; use crate::keccak::keccak_stark::{KeccakStark, INPUT_LIMBS, NUM_ROUNDS};
use crate::proof::AllProof; use crate::proof::AllProof;
use crate::prover::prove; use crate::prover::prove;
@ -116,11 +116,13 @@ mod tests {
// TODO: temporary until cross-table-lookup filters are implemented // TODO: temporary until cross-table-lookup filters are implemented
let cross_table_lookups = vec![CrossTableLookup::new( let cross_table_lookups = vec![CrossTableLookup::new(
vec![Table::Cpu], vec![TableWithColumns::new(
vec![vec![cpu::columns::OPCODE]], Table::Cpu,
Table::Keccak, vec![cpu::columns::OPCODE],
vec![keccak_looked_col], vec![],
default, )],
TableWithColumns::new(Table::Keccak, vec![keccak_looked_col], vec![]),
Some(default),
)]; )];
let all_stark = AllStark { let all_stark = AllStark {

7
evm/src/cross_table_lookup.rs
View File

@ -68,9 +68,12 @@ impl<F: Field> CrossTableLookup<F> {
.iter() .iter()
.all(|twc| twc.filter_columns.is_empty()) .all(|twc| twc.filter_columns.is_empty())
== default.is_some() == default.is_some()
&& default.is_some() == looked_table.filter_columns.is_empty() && default.is_some() == looked_table.filter_columns.is_empty(),
"Default values should be provided iff there are no filter columns."
); );
assert!(default.len() == looked_columns.len()); if let Some(default) = &default {
assert_eq!(default.len(), looked_table.columns.len());
}
Self { Self {
looking_tables, looking_tables,
looked_table, looked_table,