Skip to content

Commit

Permalink
Remove use of default for points and scalars
Browse files Browse the repository at this point in the history
  • Loading branch information
@AaronFeickert
AaronFeickert committed Sep 3, 2024
1 parent 507a952 commit f80638f
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 36 deletions.
4 changes: 2 additions & 2 deletions src/protocols/transcript_protocol.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ impl TranscriptProtocol for Transcript {

#[cfg(test)]
mod test {
use curve25519_dalek::RistrettoPoint;
use curve25519_dalek::{traits::Identity, RistrettoPoint};
use merlin::Transcript;

use super::*;
Expand All @@ -89,7 +89,7 @@ mod test {
fn test_identity_point() {
let mut transcript = Transcript::new(b"test");
assert!(transcript
.validate_and_append_point(b"identity", &RistrettoPoint::default().compress())
.validate_and_append_point(b"identity", &RistrettoPoint::identity().compress())
.is_err());
}
}
60 changes: 30 additions & 30 deletions src/range_proof.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1337,11 +1337,11 @@ mod tests {
assert!((RistrettoRangeProof::from_bytes(&[])).is_err());
assert!((RistrettoRangeProof::from_bytes(Scalar::ZERO.as_bytes().as_slice())).is_err());
let proof = RistrettoRangeProof {
a: Default::default(),
a1: Default::default(),
b: Default::default(),
r1: Default::default(),
s1: Default::default(),
a: CompressedRistretto::identity(),
a1: CompressedRistretto::identity(),
b: CompressedRistretto::identity(),
r1: Scalar::ZERO,
s1: Scalar::ZERO,
d1: vec![],
li: vec![],
ri: vec![],
Expand All @@ -1351,14 +1351,14 @@ mod tests {
assert!(RistrettoRangeProof::from_bytes(&proof_bytes).is_err());

let proof = RistrettoRangeProof {
a: Default::default(),
a1: Default::default(),
b: Default::default(),
r1: Default::default(),
s1: Default::default(),
d1: vec![Scalar::default()],
li: vec![CompressedRistretto::default()],
ri: vec![CompressedRistretto::default()],
a: CompressedRistretto::identity(),
a1: CompressedRistretto::identity(),
b: CompressedRistretto::identity(),
r1: Scalar::ZERO,
s1: Scalar::ZERO,
d1: vec![Scalar::ZERO],
li: vec![CompressedRistretto::identity()],
ri: vec![CompressedRistretto::identity()],
extension_degree: ExtensionDegree::DefaultPedersen,
};
let proof_bytes = proof.to_bytes();
Expand All @@ -1370,21 +1370,21 @@ mod tests {
);

let proof = RistrettoRangeProof {
a: Default::default(),
a1: Default::default(),
b: Default::default(),
r1: Default::default(),
s1: Default::default(),
a: CompressedRistretto::identity(),
a1: CompressedRistretto::identity(),
b: CompressedRistretto::identity(),
r1: Scalar::ZERO,
s1: Scalar::ZERO,
d1: vec![
Scalar::default(),
Scalar::default(),
Scalar::default(),
Scalar::default(),
Scalar::default(),
Scalar::default(),
Scalar::ZERO,
Scalar::ZERO,
Scalar::ZERO,
Scalar::ZERO,
Scalar::ZERO,
Scalar::ZERO,
],
li: vec![CompressedRistretto::default()],
ri: vec![CompressedRistretto::default()],
li: vec![CompressedRistretto::identity()],
ri: vec![CompressedRistretto::identity()],
extension_degree: ExtensionDegree::AddFiveBasePoints,
};
let proof_bytes = proof.to_bytes();
Expand Down Expand Up @@ -1492,7 +1492,7 @@ mod tests {

// Make the second statement's `g_base_vec` mismatch against the first statement
let mut gens_mismatch = create_pedersen_gens_with_extension_degree(ExtensionDegree::DefaultPedersen);
gens_mismatch.g_base_vec[0] = RistrettoPoint::default();
gens_mismatch.g_base_vec[0] = RistrettoPoint::identity();
let params_mismatch = RangeParameters::init(4, 1, gens_mismatch).unwrap();
let statement_mismatch = RangeStatement::init(
params_mismatch.clone(),
Expand All @@ -1509,7 +1509,7 @@ mod tests {

// Make the second statement's `h_base` mismatch against the first statement
let mut gens_mismatch = create_pedersen_gens_with_extension_degree(ExtensionDegree::DefaultPedersen);
gens_mismatch.h_base = RistrettoPoint::default();
gens_mismatch.h_base = RistrettoPoint::identity();
let params_mismatch = RangeParameters::init(4, 1, gens_mismatch).unwrap();
let statement_mismatch = RangeStatement::init(
params_mismatch.clone(),
Expand Down Expand Up @@ -1577,7 +1577,7 @@ mod tests {

// Make the second statement's `gi_base` mismatch against the first statement
let mut gens_mismatch = BulletproofGens::new(4, 1).unwrap();
gens_mismatch.g_vec[0][0] = RistrettoPoint::default();
gens_mismatch.g_vec[0][0] = RistrettoPoint::identity();
let params_mismatch = RangeParameters {
bp_gens: gens_mismatch,
pc_gens: create_pedersen_gens_with_extension_degree(ExtensionDegree::DefaultPedersen),
Expand All @@ -1597,7 +1597,7 @@ mod tests {

// Make the second statement's `hi_base` mismatch against the first statement
let mut gens_mismatch = BulletproofGens::new(4, 1).unwrap();
gens_mismatch.h_vec[0][0] = RistrettoPoint::default();
gens_mismatch.h_vec[0][0] = RistrettoPoint::identity();
let params_mismatch = RangeParameters {
bp_gens: gens_mismatch,
pc_gens: create_pedersen_gens_with_extension_degree(ExtensionDegree::DefaultPedersen),
Expand Down
4 changes: 2 additions & 2 deletions src/range_statement.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ impl<P: Compressable + Precomputable> Drop for RangeStatement<P> {
mod test {
use alloc::vec;

use curve25519_dalek::RistrettoPoint;
use curve25519_dalek::{traits::Identity, RistrettoPoint};

use super::*;
use crate::{
Expand All @@ -95,7 +95,7 @@ mod test {

#[test]
fn test_init_errors() {
let p = RistrettoPoint::default();
let p = RistrettoPoint::identity();

// Set up parameters
let params = RangeParameters::init(
Expand Down
5 changes: 3 additions & 2 deletions src/ristretto.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use alloc::{borrow::ToOwned, string::ToString, vec::Vec};
use curve25519_dalek::{
constants::{RISTRETTO_BASEPOINT_COMPRESSED, RISTRETTO_BASEPOINT_POINT},
ristretto::{CompressedRistretto, RistrettoPoint, VartimeRistrettoPrecomputation},
traits::Identity,
};
use once_cell::sync::OnceCell;

Expand Down Expand Up @@ -87,7 +88,7 @@ fn get_g_base(extension_degree: ExtensionDegree) -> (Vec<RistrettoPoint>, Vec<Co
fn ristretto_masking_basepoints() -> &'static [RistrettoPoint; ExtensionDegree::COUNT] {
static INSTANCE: OnceCell<[RistrettoPoint; ExtensionDegree::COUNT]> = OnceCell::new();
INSTANCE.get_or_init(|| {
let mut arr = [RistrettoPoint::default(); ExtensionDegree::COUNT];
let mut arr = [RistrettoPoint::identity(); ExtensionDegree::COUNT];
for (i, point) in (ExtensionDegree::MINIMUM..).zip(arr.iter_mut()) {
let label = "RISTRETTO_MASKING_BASEPOINT_".to_owned() + &i.to_string();
*point = RistrettoPoint::hash_from_bytes_sha3_512(label.as_bytes());
Expand All @@ -101,7 +102,7 @@ fn ristretto_masking_basepoints() -> &'static [RistrettoPoint; ExtensionDegree::
fn ristretto_compressed_masking_basepoints() -> &'static [CompressedRistretto; ExtensionDegree::COUNT] {
static INSTANCE: OnceCell<[CompressedRistretto; ExtensionDegree::COUNT]> = OnceCell::new();
INSTANCE.get_or_init(|| {
let mut arr = [CompressedRistretto::default(); ExtensionDegree::COUNT];
let mut arr = [CompressedRistretto::identity(); ExtensionDegree::COUNT];
for (i, point) in ristretto_masking_basepoints().iter().enumerate() {
arr[i] = point.compress();
}
Expand Down

0 comments on commit f80638f

Please sign in to comment.