Skip to content

Rename zero functions to placeholder functions #34

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

Open
Will-Lin4 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename zero functions to placeholder functions #34

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
4 changes: 2 additions & 2 deletions src/hp_as/constraints/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ where
if num_all_inputs == 0 {
default_input_instance = Some(InputInstanceVar::new_constant(
sponge.cs(),
InputInstance::zero(),
InputInstance::placeholder(),
)?);

input_instances.push(default_input_instance.as_ref().unwrap());
Expand All @@ -316,7 +316,7 @@ where
if make_zk && num_all_inputs == 1 {
placeholder_input_instance = Some(InputInstanceVar::new_constant(
sponge.cs(),
InputInstance::zero(),
InputInstance::placeholder(),
)?);

input_instances.push(placeholder_input_instance.as_ref().unwrap());
Expand Down
4 changes: 2 additions & 2 deletions src/hp_as/data_structures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub struct InputInstance<G: AffineCurve> {
}

impl<G: AffineCurve> InputInstance<G> {
pub(crate) fn zero() -> Self {
pub(crate) fn placeholder() -> Self {
Self {
comm_1: G::zero(),
comm_2: G::zero(),
Expand Down Expand Up @@ -63,7 +63,7 @@ pub struct InputWitness<F: Field> {
}

impl<F: Field> InputWitness<F> {
pub(crate) fn zero(vec_len: usize) -> Self {
pub(crate) fn placeholder(vec_len: usize) -> Self {
Self {
a_vec: vec![F::zero(); vec_len],
b_vec: vec![F::zero(); vec_len],
Expand Down
12 changes: 6 additions & 6 deletions src/hp_as/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,8 @@ where
let default_input_instance;
let default_input_witness;
if num_all_inputs == 0 {
default_input_instance = Some(InputInstance::zero());
default_input_witness = Some(InputWitness::zero(hp_vec_len));
default_input_instance = Some(InputInstance::placeholder());
default_input_witness = Some(InputWitness::placeholder(hp_vec_len));

inputs.push(InputRef::<_, _, Self> {
instance: default_input_instance.as_ref().unwrap(),
Expand All @@ -699,8 +699,8 @@ where
let placeholder_input_instance;
let placeholder_input_witness;
if make_zk_enabled && num_all_inputs == 1 {
placeholder_input_instance = Some(InputInstance::zero());
placeholder_input_witness = Some(InputWitness::zero(hp_vec_len));
placeholder_input_instance = Some(InputInstance::placeholder());
placeholder_input_witness = Some(InputWitness::placeholder(hp_vec_len));

inputs.push(InputRef::<_, _, Self> {
instance: placeholder_input_instance.as_ref().unwrap(),
Expand Down Expand Up @@ -836,7 +836,7 @@ where
// Use the default input_instance if no inputs or accumulators are provided.
let default_input_instance;
if num_all_inputs == 0 {
default_input_instance = Some(InputInstance::zero());
default_input_instance = Some(InputInstance::placeholder());

input_instances.push(default_input_instance.as_ref().unwrap());
num_all_inputs += 1;
Expand All @@ -845,7 +845,7 @@ where
// Placeholder input for hiding.
let placeholder_input_instance;
if make_zk && num_all_inputs == 1 {
placeholder_input_instance = Some(InputInstance::zero());
placeholder_input_instance = Some(InputInstance::placeholder());

input_instances.push(placeholder_input_instance.as_ref().unwrap());
num_all_inputs += 1;
Expand Down
2 changes: 1 addition & 1 deletion src/r1cs_nark_as/constraints/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ where
if input_instances.is_empty() && old_accumulator_instances.is_empty() {
default_input_instance = Some(InputInstanceVar::new_constant(
sponge.cs(),
InputInstance::zero(r1cs_input_len, false),
InputInstance::placeholder(r1cs_input_len, false),
)?);
input_instances.push(default_input_instance.as_ref().unwrap());
}
Expand Down
6 changes: 3 additions & 3 deletions src/r1cs_nark_as/data_structures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ pub struct InputInstance<G: AffineCurve> {

impl<G: AffineCurve> InputInstance<G> {
/// Returns a default input instance.
pub fn zero(input_len: usize, make_zk: bool) -> Self {
pub fn placeholder(input_len: usize, make_zk: bool) -> Self {
Self {
r1cs_input: vec![G::ScalarField::zero(); input_len],
first_round_message: FirstRoundMessage::zero(make_zk),
first_round_message: FirstRoundMessage::placeholder(make_zk),
}
}
}
Expand Down Expand Up @@ -178,7 +178,7 @@ impl<G: AffineCurve> AccumulatorInstance<G> {
comm_a: G::zero(),
comm_b: G::zero(),
comm_c: G::zero(),
hp_instance: HPInputInstance::<G>::zero(),
hp_instance: HPInputInstance::<G>::placeholder(),
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/r1cs_nark_as/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,8 +760,8 @@ where
let default_input_instance;
let default_input_witness;
if input_instances.is_empty() && old_accumulator_instances.is_empty() {
default_input_instance = Some(InputInstance::zero(r1cs_input_len, false));
default_input_witness = Some(InputWitness::zero(r1cs_witness_len, false));
default_input_instance = Some(InputInstance::placeholder(r1cs_input_len, false));
default_input_witness = Some(InputWitness::placeholder(r1cs_witness_len, false));

input_instances.push(default_input_instance.as_ref().unwrap());
input_witnesses.push(default_input_witness.as_ref().unwrap());
Expand Down Expand Up @@ -963,7 +963,7 @@ where
// Default input in the case there are no provided inputs or accumulators.
let default_input_instance;
if input_instances.is_empty() && old_accumulator_instances.is_empty() {
default_input_instance = Some(InputInstance::zero(r1cs_input_len, false));
default_input_instance = Some(InputInstance::placeholder(r1cs_input_len, false));
input_instances.push(default_input_instance.as_ref().unwrap());
}

Expand Down
4 changes: 2 additions & 2 deletions src/r1cs_nark_as/r1cs_nark/data_structures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pub struct FirstRoundMessage<G: AffineCurve> {
}

impl<G: AffineCurve> FirstRoundMessage<G> {
pub(crate) fn zero(make_zk: bool) -> Self {
pub(crate) fn placeholder(make_zk: bool) -> Self {
Self {
comm_a: G::zero(),
comm_b: G::zero(),
Expand Down Expand Up @@ -177,7 +177,7 @@ pub struct SecondRoundMessage<F: Field> {
}

impl<F: Field> SecondRoundMessage<F> {
pub(crate) fn zero(witness_len: usize, make_zk: bool) -> Self {
pub(crate) fn placeholder(witness_len: usize, make_zk: bool) -> Self {
Self {
blinded_witness: vec![F::zero(); witness_len],
randomness: if make_zk {
Expand Down
6 changes: 4 additions & 2 deletions src/trivial_pc_as/constraints/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,10 @@ where

let default_input_instance;
if all_input_instances.is_empty() {
default_input_instance =
Some(InputInstanceVar::new_constant(cs, InputInstance::zero())?);
default_input_instance = Some(InputInstanceVar::new_constant(
cs,
InputInstance::placeholder(),
)?);
all_input_instances.push(default_input_instance.as_ref().unwrap());
}

Expand Down
2 changes: 1 addition & 1 deletion src/trivial_pc_as/data_structures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub struct InputInstance<G: AffineCurve> {
}

impl<G: AffineCurve> InputInstance<G> {
pub(crate) fn zero() -> Self {
pub(crate) fn placeholder() -> Self {
Self {
commitment: LabeledCommitment::new(
PolynomialLabel::new(),
Expand Down
4 changes: 2 additions & 2 deletions src/trivial_pc_as/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ where
let default_input_instance;
let default_input_witness;
if inputs.is_empty() && accumulators.is_empty() {
default_input_instance = Some(InputInstance::zero());
default_input_instance = Some(InputInstance::placeholder());
default_input_witness = Some(LabeledPolynomial::new(
PolynomialLabel::new(),
DensePolynomial::zero(),
Expand Down Expand Up @@ -500,7 +500,7 @@ where
// Default input in the case there are no provided inputs or accumulators.
let default_input_instance;
if all_input_instances.is_empty() {
default_input_instance = Some(InputInstance::zero());
default_input_instance = Some(InputInstance::placeholder());
all_input_instances.push(default_input_instance.as_ref().unwrap());
}

Expand Down