zecfoundation
/
jubjub
mirror of https://github.com/ZcashFoundation/jubjub.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cargo fmt

This commit is contained in:
Sean Bowe 2019-05-21 16:32:08 -06:00
parent 4aebd80105
commit 8c5adc3708
No known key found for this signature in database
GPG Key ID: 95684257D8F8B031
3 changed files with 69 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/fq.rs
View File

@ -692,7 +692,8 @@ fn test_from_bytes() {
Fq::from_bytes([
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0
]).unwrap(),
])
.unwrap(),
Fq::zero()
);
@ -700,7 +701,8 @@ fn test_from_bytes() {
Fq::from_bytes([
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0
]).unwrap(),
])
.unwrap(),
Fq::one()
);
@ -708,7 +710,8 @@ fn test_from_bytes() {
Fq::from_bytes([
254, 255, 255, 255, 1, 0, 0, 0, 2, 72, 3, 0, 250, 183, 132, 88, 245, 79, 188, 236, 239,
79, 140, 153, 111, 5, 197, 172, 89, 177, 36, 24
]).unwrap(),
])
.unwrap(),
R2
);
@ -717,8 +720,10 @@ fn test_from_bytes() {
Fq::from_bytes([
0, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8,
216, 57, 51, 72, 125, 157, 41, 83, 167, 237, 115
]).is_some()
.unwrap_u8() == 1
])
.is_some()
.unwrap_u8()
== 1
);
// modulus is invalid
@ -726,8 +731,10 @@ fn test_from_bytes() {
Fq::from_bytes([
1, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8,
216, 57, 51, 72, 125, 157, 41, 83, 167, 237, 115
]).is_none()
.unwrap_u8() == 1
])
.is_none()
.unwrap_u8()
== 1
);
// Anything larger than the modulus is invalid
@ -735,22 +742,28 @@ fn test_from_bytes() {
Fq::from_bytes([
2, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8,
216, 57, 51, 72, 125, 157, 41, 83, 167, 237, 115
]).is_none()
.unwrap_u8() == 1
])
.is_none()
.unwrap_u8()
== 1
);
assert!(
Fq::from_bytes([
1, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8,
216, 58, 51, 72, 125, 157, 41, 83, 167, 237, 115
]).is_none()
.unwrap_u8() == 1
])
.is_none()
.unwrap_u8()
== 1
);
assert!(
Fq::from_bytes([
1, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8,
216, 57, 51, 72, 125, 157, 41, 83, 167, 237, 116
]).is_none()
.unwrap_u8() == 1
])
.is_none()
.unwrap_u8()
== 1
);
}

39
src/fr.rs
View File

@ -645,7 +645,8 @@ fn test_from_bytes() {
Fr::from_bytes([
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0
]).unwrap(),
])
.unwrap(),
Fr::zero()
);
@ -653,7 +654,8 @@ fn test_from_bytes() {
Fr::from_bytes([
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0
]).unwrap(),
])
.unwrap(),
Fr::one()
);
@ -661,7 +663,8 @@ fn test_from_bytes() {
Fr::from_bytes([
217, 7, 150, 185, 179, 11, 248, 37, 80, 231, 182, 102, 47, 214, 21, 243, 244, 20, 136,
235, 238, 20, 37, 147, 198, 85, 145, 71, 111, 252, 166, 9
]).unwrap(),
])
.unwrap(),
R2
);
@ -670,8 +673,10 @@ fn test_from_bytes() {
Fr::from_bytes([
182, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52,
1, 1, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 14
]).is_some()
.unwrap_u8() == 1
])
.is_some()
.unwrap_u8()
== 1
);
// modulus is invalid
@ -679,8 +684,10 @@ fn test_from_bytes() {
Fr::from_bytes([
183, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52,
1, 1, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 14
]).is_none()
.unwrap_u8() == 1
])
.is_none()
.unwrap_u8()
== 1
);
// Anything larger than the modulus is invalid
@ -688,24 +695,30 @@ fn test_from_bytes() {
Fr::from_bytes([
184, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52,
1, 1, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 14
]).is_none()
.unwrap_u8() == 1
])
.is_none()
.unwrap_u8()
== 1
);
assert!(
Fr::from_bytes([
183, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52,
1, 1, 59, 104, 6, 169, 175, 51, 101, 234, 180, 125, 14
]).is_none()
.unwrap_u8() == 1
])
.is_none()
.unwrap_u8()
== 1
);
assert!(
Fr::from_bytes([
183, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52,
1, 1, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 15
]).is_none()
.unwrap_u8() == 1
])
.is_none()
.unwrap_u8()
== 1
);
}

26
src/lib.rs
View File

@ -375,7 +375,7 @@ impl AffinePoint {
AffineNielsPoint {
v_plus_u: self.v.field_add(&self.u),
v_minus_u: self.v.subtract(&self.u),
t2d: self.u.multiply(&self.v).multiply(&EDWARDS_D2)
t2d: self.u.multiply(&self.v).multiply(&EDWARDS_D2),
}
}
@ -545,7 +545,8 @@ impl ExtendedPoint {
v: vv_plus_uu,
z: vv_minus_uu,
t: &zz2 - &vv_minus_uu,
}.into_extended()
}
.into_extended()
}
#[inline]
@ -630,7 +631,8 @@ impl<'a, 'b> Add<&'b ExtendedNielsPoint> for &'a ExtendedPoint {
v: &b + &a,
z: &d + &c,
t: &d - &c,
}.into_extended()
}
.into_extended()
}
}
@ -648,7 +650,8 @@ impl<'a, 'b> Sub<&'b ExtendedNielsPoint> for &'a ExtendedPoint {
v: &b + &a,
z: &d - &c,
t: &d + &c,
}.into_extended()
}
.into_extended()
}
}
@ -674,7 +677,8 @@ impl<'a, 'b> Add<&'b AffineNielsPoint> for &'a ExtendedPoint {
v: &b + &a,
z: &d + &c,
t: &d - &c,
}.into_extended()
}
.into_extended()
}
}
@ -692,7 +696,8 @@ impl<'a, 'b> Sub<&'b AffineNielsPoint> for &'a ExtendedPoint {
v: &b + &a,
z: &d - &c,
t: &d + &c,
}.into_extended()
}
.into_extended()
}
}
@ -890,7 +895,8 @@ fn test_assoc() {
0x46462e26d4edb8c7,
0x10b4c1517ca82e9b,
]),
}).mul_by_cofactor();
})
.mul_by_cofactor();
assert!(p.is_on_curve_vartime());
assert_eq!(
@ -915,7 +921,8 @@ fn test_batch_normalize() {
0x46462e26d4edb8c7,
0x10b4c1517ca82e9b,
]),
}).mul_by_cofactor();
})
.mul_by_cofactor();
let mut v = vec![];
for _ in 0..10 {
@ -1149,7 +1156,8 @@ fn test_mul_consistency() {
0x46462e26d4edb8c7,
0x10b4c1517ca82e9b,
]),
}).mul_by_cofactor();
})
.mul_by_cofactor();
assert_eq!(p * c, (p * a) * b);
}