cargo fmt

This commit is contained in:
Eirik0 2019-02-06 23:52:18 -07:00
parent 812ab51091
commit 43e451f103
2 changed files with 62 additions and 66 deletions

View File

@ -646,7 +646,8 @@ fn test_from_bytes_vartime() {
Fq::from_bytes_vartime([ Fq::from_bytes_vartime([
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, 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() Fq::zero()
); );
@ -654,7 +655,8 @@ fn test_from_bytes_vartime() {
Fq::from_bytes_vartime([ Fq::from_bytes_vartime([
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, 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 0, 0, 0
]).unwrap(), ])
.unwrap(),
Fq::one() Fq::one()
); );
@ -662,45 +664,41 @@ fn test_from_bytes_vartime() {
Fq::from_bytes_vartime([ Fq::from_bytes_vartime([
254, 255, 255, 255, 1, 0, 0, 0, 2, 72, 3, 0, 250, 183, 132, 88, 245, 79, 188, 236, 239, 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 79, 140, 153, 111, 5, 197, 172, 89, 177, 36, 24
]).unwrap(), ])
.unwrap(),
R2 R2
); );
// -1 should work // -1 should work
assert!( assert!(Fq::from_bytes_vartime([
Fq::from_bytes_vartime([ 0, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8, 216,
0, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8, 57, 51, 72, 125, 157, 41, 83, 167, 237, 115
216, 57, 51, 72, 125, 157, 41, 83, 167, 237, 115 ])
]).is_some() .is_some());
);
// modulus is invalid // modulus is invalid
assert!( assert!(Fq::from_bytes_vartime([
Fq::from_bytes_vartime([ 1, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8, 216,
1, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8, 57, 51, 72, 125, 157, 41, 83, 167, 237, 115
216, 57, 51, 72, 125, 157, 41, 83, 167, 237, 115 ])
]).is_none() .is_none());
);
// Anything larger than the modulus is invalid // Anything larger than the modulus is invalid
assert!( assert!(Fq::from_bytes_vartime([
Fq::from_bytes_vartime([ 2, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8, 216,
2, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8, 57, 51, 72, 125, 157, 41, 83, 167, 237, 115
216, 57, 51, 72, 125, 157, 41, 83, 167, 237, 115 ])
]).is_none() .is_none());
); assert!(Fq::from_bytes_vartime([
assert!( 1, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8, 216,
Fq::from_bytes_vartime([ 58, 51, 72, 125, 157, 41, 83, 167, 237, 115
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());
]).is_none() assert!(Fq::from_bytes_vartime([
); 1, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8, 216,
assert!( 57, 51, 72, 125, 157, 41, 83, 167, 237, 116
Fq::from_bytes_vartime([ ])
1, 0, 0, 0, 255, 255, 255, 255, 254, 91, 254, 255, 2, 164, 189, 83, 5, 216, 161, 9, 8, .is_none());
216, 57, 51, 72, 125, 157, 41, 83, 167, 237, 116
]).is_none()
);
} }
#[cfg(test)] #[cfg(test)]

View File

@ -589,7 +589,8 @@ fn test_from_bytes_vartime() {
Fr::from_bytes_vartime([ Fr::from_bytes_vartime([
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, 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() Fr::zero()
); );
@ -597,7 +598,8 @@ fn test_from_bytes_vartime() {
Fr::from_bytes_vartime([ Fr::from_bytes_vartime([
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, 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 0, 0, 0
]).unwrap(), ])
.unwrap(),
Fr::one() Fr::one()
); );
@ -605,47 +607,43 @@ fn test_from_bytes_vartime() {
Fr::from_bytes_vartime([ Fr::from_bytes_vartime([
217, 7, 150, 185, 179, 11, 248, 37, 80, 231, 182, 102, 47, 214, 21, 243, 244, 20, 136, 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 235, 238, 20, 37, 147, 198, 85, 145, 71, 111, 252, 166, 9
]).unwrap(), ])
.unwrap(),
R2 R2
); );
// -1 should work // -1 should work
assert!( assert!(Fr::from_bytes_vartime([
Fr::from_bytes_vartime([ 182, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 1, 1,
182, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 14
1, 1, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 14 ])
]).is_some() .is_some());
);
// modulus is invalid // modulus is invalid
assert!( assert!(Fr::from_bytes_vartime([
Fr::from_bytes_vartime([ 183, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 1, 1,
183, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 14
1, 1, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 14 ])
]).is_none() .is_none());
);
// Anything larger than the modulus is invalid // Anything larger than the modulus is invalid
assert!( assert!(Fr::from_bytes_vartime([
Fr::from_bytes_vartime([ 184, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 1, 1,
184, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 14
1, 1, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 14 ])
]).is_none() .is_none());
);
assert!( assert!(Fr::from_bytes_vartime([
Fr::from_bytes_vartime([ 183, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 1, 1,
183, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 59, 104, 6, 169, 175, 51, 101, 234, 180, 125, 14
1, 1, 59, 104, 6, 169, 175, 51, 101, 234, 180, 125, 14 ])
]).is_none() .is_none());
);
assert!( assert!(Fr::from_bytes_vartime([
Fr::from_bytes_vartime([ 183, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 1, 1,
183, 44, 247, 214, 94, 14, 151, 208, 130, 16, 200, 204, 147, 32, 104, 166, 0, 59, 52, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 15
1, 1, 59, 103, 6, 169, 175, 51, 101, 234, 180, 125, 15 ])
]).is_none() .is_none());
);
} }
#[cfg(test)] #[cfg(test)]