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

Jump to bottom

chore: Reenable private kernel function tree checks #4358

Merged
merged 1 commit into from
Feb 1, 2024
Merged

chore: Reenable private kernel function tree checks #4358

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
43 changes: 21 additions & 22 deletions yarn-project/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_init.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,47 +429,46 @@ mod tests {
builder.failed();
}

// #[test(should_fail_with="computed_contract_tree_root does not match purported_contract_tree_root")]
fn private_function_incorrect_contract_leaf_index_fails() {
#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_function_leaf_index_fails() {
let mut builder = PrivateKernelInitInputsBuilder::new();

// Set the leaf index of the contract leaf to a wrong value (the correct value + 1).
// let leaf_index = builder.private_call.contract_leaf_membership_witness.leaf_index;
// builder.private_call.contract_leaf_membership_witness.leaf_index = leaf_index + 1;
// Set the leaf index of the function leaf to a wrong value (the correct value + 1).
let leaf_index = builder.private_call.function_leaf_membership_witness.leaf_index;
builder.private_call.function_leaf_membership_witness.leaf_index = leaf_index + 1;

builder.failed();
}

// #[test(should_fail_with="computed_contract_tree_root does not match purported_contract_tree_root")]
fn private_function_incorrect_contract_leaf_sibling_path_fails() {
#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_function_leaf_sibling_path_fails() {
let mut builder = PrivateKernelInitInputsBuilder::new();

// Set the first value of the sibling path to a wrong value (the correct value + 1).
// let sibling_path_0 = builder.private_call.contract_leaf_membership_witness.sibling_path[0];
// builder.private_call.contract_leaf_membership_witness.sibling_path[0] = sibling_path_0 + 1;
let sibling_path_0 = builder.private_call.function_leaf_membership_witness.sibling_path[0];
builder.private_call.function_leaf_membership_witness.sibling_path[0] = sibling_path_0 + 1;

builder.failed();
}

// #[test(should_fail_with="computed_contract_tree_root does not match purported_contract_tree_root")]
fn private_function_incorrect_function_leaf_index_fails() {
#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_contract_class_preimage_fails() {
let mut builder = PrivateKernelInitInputsBuilder::new();

// Set the leaf index of the function leaf to a wrong value (the correct value + 1).
let leaf_index = builder.private_call.function_leaf_membership_witness.leaf_index;
builder.private_call.function_leaf_membership_witness.leaf_index = leaf_index + 1;

builder.private_call.contract_class_artifact_hash = builder.private_call.contract_class_artifact_hash + 1;
builder.failed();
}

// #[test(should_fail_with="computed_contract_tree_root does not match purported_contract_tree_root")]
fn private_function_incorrect_function_leaf_sibling_path_fails() {
#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_partial_address_preimage_fails() {
let mut builder = PrivateKernelInitInputsBuilder::new();
builder.private_call.salted_initialization_hash.inner = builder.private_call.salted_initialization_hash.inner + 1;
builder.failed();
}

// Set the first value of the sibling path to a wrong value (the correct value + 1).
let sibling_path_0 = builder.private_call.function_leaf_membership_witness.sibling_path[0];
builder.private_call.function_leaf_membership_witness.sibling_path[0] = sibling_path_0 + 1;

#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_address_preimage_fails() {
let mut builder = PrivateKernelInitInputsBuilder::new();
builder.private_call.public_keys_hash.inner = builder.private_call.public_keys_hash.inner + 1;
builder.failed();
}

Expand Down
43 changes: 21 additions & 22 deletions ...-project/noir-protocol-circuits/src/crates/private-kernel-lib/src/private_kernel_inner.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,47 +176,46 @@ mod tests {
builder.failed();
}

// #[test(should_fail_with = "computed_contract_tree_root does not match purported_contract_tree_root")]
fn private_function_incorrect_contract_leaf_index_fails() {
#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_function_leaf_index_fails() {
let mut builder = PrivateKernelInnerInputsBuilder::new();

// Set the leaf index of the contract leaf to a wrong value (the correct value + 1).
// let leaf_index = builder.private_call.contract_leaf_membership_witness.leaf_index;
// builder.private_call.contract_leaf_membership_witness.leaf_index = leaf_index + 1;
// Set the leaf index of the function leaf to a wrong value (the correct value + 1).
let leaf_index = builder.private_call.function_leaf_membership_witness.leaf_index;
builder.private_call.function_leaf_membership_witness.leaf_index = leaf_index + 1;

builder.failed();
}

// #[test(should_fail_with = "computed_contract_tree_root does not match purported_contract_tree_root")]
fn private_function_incorrect_contract_leaf_sibling_path_fails() {
#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_function_leaf_sibling_path_fails() {
let mut builder = PrivateKernelInnerInputsBuilder::new();

// Set the first value of the sibling path to a wrong value (the correct value + 1).
// let sibling_path_0 = builder.private_call.contract_leaf_membership_witness.sibling_path[0];
// builder.private_call.contract_leaf_membership_witness.sibling_path[0] = sibling_path_0 + 1;
let sibling_path_0 = builder.private_call.function_leaf_membership_witness.sibling_path[0];
builder.private_call.function_leaf_membership_witness.sibling_path[0] = sibling_path_0 + 1;

builder.failed();
}

// #[test(should_fail_with = "computed_contract_tree_root does not match purported_contract_tree_root")]
fn private_function_incorrect_function_leaf_index_fails() {
#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_contract_class_preimage_fails() {
let mut builder = PrivateKernelInnerInputsBuilder::new();

// Set the leaf index of the function leaf to a wrong value (the correct value + 1).
let leaf_index = builder.private_call.function_leaf_membership_witness.leaf_index;
builder.private_call.function_leaf_membership_witness.leaf_index = leaf_index + 1;

builder.private_call.contract_class_artifact_hash = builder.private_call.contract_class_artifact_hash + 1;
builder.failed();
}

// #[test(should_fail_with = "computed_contract_tree_root does not match purported_contract_tree_root")]
fn private_function_incorrect_function_leaf_sibling_path_fails() {
#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_partial_address_preimage_fails() {
let mut builder = PrivateKernelInnerInputsBuilder::new();
builder.private_call.salted_initialization_hash.inner = builder.private_call.salted_initialization_hash.inner + 1;
builder.failed();
}

// Set the first value of the sibling path to a wrong value (the correct value + 1).
let sibling_path_0 = builder.private_call.function_leaf_membership_witness.sibling_path[0];
builder.private_call.function_leaf_membership_witness.sibling_path[0] = sibling_path_0 + 1;

#[test(should_fail_with="computed contract address does not match expected one")]
fn private_function_incorrect_address_preimage_fails() {
let mut builder = PrivateKernelInnerInputsBuilder::new();
builder.private_call.public_keys_hash.inner = builder.private_call.public_keys_hash.inner + 1;
builder.failed();
}

Expand Down
Loading