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.

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

refactor: remove public kernel inner #9865

Merged
merged 4 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion noir-projects/noir-protocol-circuits/Nargo.template.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ members = [
"crates/empty-nested",
"crates/empty-nested-simulated",
"crates/public-kernel-lib",
"crates/public-kernel-inner-simulated",
"crates/public-kernel-merge-simulated",
"crates/public-kernel-tail-simulated",
"crates/reset-kernel-lib",
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,18 @@ impl EnqueuedCallDataValidator {
EnqueuedCallDataValidator { enqueued_call, phase }
}

pub fn validate_proof(_self: Self) {
// TODO
}

pub fn validate(self) {
self.validate_revert_flag()
}

pub fn validate_against_previous_kernel(
self,
previous_kernel: PublicKernelCircuitPublicInputs,
previous_validation_request_array_lengths: PublicValidationRequestArrayLengths,
previous_non_revertible_data_array_lengths: PublicAccumulatedDataArrayLengths,
previous_revertible_data_array_lengths: PublicAccumulatedDataArrayLengths,
) {
self.validate_global_variables(previous_kernel);
self.validate_against_call_request(previous_kernel);
self.validate_start_gas(previous_kernel);
self.validate_transaction_fee(previous_kernel);
self.validate_array_lengths(
previous_validation_request_array_lengths,
previous_non_revertible_data_array_lengths,
previous_revertible_data_array_lengths,
);
}

fn validate_revert_flag(self) {
Expand Down Expand Up @@ -138,27 +126,4 @@ impl EnqueuedCallDataValidator {
);
}
}

fn validate_array_lengths(
self,
previous_validation_request_array_lengths: PublicValidationRequestArrayLengths,
previous_non_revertible_data_array_lengths: PublicAccumulatedDataArrayLengths,
previous_revertible_data_array_lengths: PublicAccumulatedDataArrayLengths,
) {
assert_eq(
self.enqueued_call.data.previous_validation_request_array_lengths,
previous_validation_request_array_lengths,
"mismatch previous_validation_request_array_lengths",
);
let prev_lengths = if self.phase == PublicKernelPhase.SETUP {
previous_non_revertible_data_array_lengths
} else {
previous_revertible_data_array_lengths
};
assert_eq(
self.enqueued_call.data.previous_accumulated_data_array_lengths,
prev_lengths,
"mismatch previous_accumulated_data_array_lengths",
);
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
mod enqueued_call_data_validator;
mod previous_kernel_validator;
mod public_kernel_output_composer;
mod public_kernel_output_validator;
mod public_tail_output_composer;
mod public_tail_output_validator;
mod vm_circuit_output_composer;

This file was deleted.

Loading
Loading