github/powdr
1
1
Fork 0
mirror of https://github.com/powdr-labs/powdr.git synced 2026-04-20 03:03:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #772 from powdr-labs/reuse_query_callback_impl

Browse Source 
Reuse existing inputs to query callback utility.
This commit is contained in:
chriseth
2023-11-16 14:53:22 +00:00
committed by GitHub
parent 8a85c0e633 18d5b6095a
commit 4eb3be866d
2 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
halo2/Cargo.toml
View File

@@ -21,6 +21,7 @@ ast = { version = "0.1.0", path = "../ast" }
[dev-dependencies]
importer = { path = "../importer" }
analysis = { path = "../analysis" }
compiler = { path = "../compiler" }
executor = { path = "../executor" }
parser = { path = "../parser" }
airgen = { path = "../airgen" }

36
halo2/src/mock_prover.rs
View File

@@ -58,39 +58,15 @@ mod test {
let graph = airgen::compile(analysed);
let pil = linker::link(graph).unwrap();
let query_callback = |query: &str| -> Option<Bn254Field> {
let items = query.split(',').map(|s| s.trim()).collect::<Vec<_>>();
match items[0] {
"\"input\"" => {
assert_eq!(items.len(), 2);
let index = items[1].parse::<usize>().unwrap();
let value = inputs.get(index).cloned();
if let Some(value) = value {
log::trace!("Input query: Index {index} -> {value}");
}
value
}
"\"print\"" => {
log::info!("Print: {}", items[1..].join(", "));
Some(0.into())
}
"\"print_ch\"" => {
print!("{}", items[1].parse::<u8>().unwrap() as char);
Some(0.into())
}
"\"hint\"" => {
assert_eq!(items.len(), 2);
Some(Bn254Field::from_str(items[1]))
}
_ => None,
}
};
let analyzed = pil_analyzer::analyze_string(&format!("{pil}"));
let fixed = executor::constant_evaluator::generate(&analyzed);
let witness =
executor::witgen::WitnessGenerator::new(&analyzed, &fixed, query_callback).generate();
let witness = executor::witgen::WitnessGenerator::new(
&analyzed,
&fixed,
compiler::inputs_to_query_callback(inputs.to_vec()),
)
.generate();
let fixed = to_owned_values(fixed);