Skip to content

Commit d0bd5e8

Browse files
committed
attitional tests fixups
1 parent 65547ff commit d0bd5e8

File tree

2 files changed

+26
-86
lines changed

2 files changed

+26
-86
lines changed

src/librand/chacha.rs

Lines changed: 13 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ mod tests {
245245
}
246246

247247
#[test]
248+
#[rustfmt_skip]
248249
fn test_rng_true_values() {
249250
// Test vectors 1 and 2 from
250251
// http://tools.ietf.org/html/draft-nir-cfrg-chacha20-poly1305-04
@@ -253,41 +254,17 @@ mod tests {
253254

254255
let v = (0..16).map(|_| ra.next_u32()).collect::<Vec<_>>();
255256
assert_eq!(v,
256-
vec!(0xade0b876,
257-
0x903df1a0,
258-
0xe56a5d40,
259-
0x28bd8653,
260-
0xb819d2bd,
261-
0x1aed8da0,
262-
0xccef36a8,
263-
0xc70d778b,
264-
0x7c5941da,
265-
0x8d485751,
266-
0x3fe02477,
267-
0x374ad8b8,
268-
0xf4b8436a,
269-
0x1ca11815,
270-
0x69b687c3,
271-
0x8665eeb2));
257+
vec!(0xade0b876, 0x903df1a0, 0xe56a5d40, 0x28bd8653,
258+
0xb819d2bd, 0x1aed8da0, 0xccef36a8, 0xc70d778b,
259+
0x7c5941da, 0x8d485751, 0x3fe02477, 0x374ad8b8,
260+
0xf4b8436a, 0x1ca11815, 0x69b687c3, 0x8665eeb2));
272261

273262
let v = (0..16).map(|_| ra.next_u32()).collect::<Vec<_>>();
274263
assert_eq!(v,
275-
vec!(0xbee7079f,
276-
0x7a385155,
277-
0x7c97ba98,
278-
0x0d082d73,
279-
0xa0290fcb,
280-
0x6965e348,
281-
0x3e53c612,
282-
0xed7aee32,
283-
0x7621b729,
284-
0x434ee69c,
285-
0xb03371d5,
286-
0xd539d874,
287-
0x281fed31,
288-
0x45fb0a51,
289-
0x1f0ae1ac,
290-
0x6f4d794b));
264+
vec!(0xbee7079f, 0x7a385155, 0x7c97ba98, 0x0d082d73,
265+
0xa0290fcb, 0x6965e348, 0x3e53c612, 0xed7aee32,
266+
0x7621b729, 0x434ee69c, 0xb03371d5, 0xd539d874,
267+
0x281fed31, 0x45fb0a51, 0x1f0ae1ac, 0x6f4d794b));
291268

292269

293270
let seed: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7];
@@ -304,22 +281,10 @@ mod tests {
304281
}
305282

306283
assert_eq!(v,
307-
vec!(0xf225c81a,
308-
0x6ab1be57,
309-
0x04d42951,
310-
0x70858036,
311-
0x49884684,
312-
0x64efec72,
313-
0x4be2d186,
314-
0x3615b384,
315-
0x11cfa18e,
316-
0xd3c50049,
317-
0x75c775f6,
318-
0x434c6530,
319-
0x2c5bad8f,
320-
0x898881dc,
321-
0x5f1c86d9,
322-
0xc1f8e7f4));
284+
vec!(0xf225c81a, 0x6ab1be57, 0x04d42951, 0x70858036,
285+
0x49884684, 0x64efec72, 0x4be2d186, 0x3615b384,
286+
0x11cfa18e, 0xd3c50049, 0x75c775f6, 0x434c6530,
287+
0x2c5bad8f, 0x898881dc, 0x5f1c86d9, 0xc1f8e7f4));
323288
}
324289

325290
#[test]

src/librand/isaac.rs

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -591,22 +591,15 @@ mod tests {
591591
}
592592

593593
#[test]
594+
#[rustfmt_skip]
594595
fn test_rng_32_true_values() {
595596
let seed: &[_] = &[1, 23, 456, 7890, 12345];
596597
let mut ra: IsaacRng = SeedableRng::from_seed(seed);
597598
// Regression test that isaac is actually using the above vector
598599
let v = (0..10).map(|_| ra.next_u32()).collect::<Vec<_>>();
599600
assert_eq!(v,
600-
vec!(2558573138,
601-
873787463,
602-
263499565,
603-
2103644246,
604-
3595684709,
605-
4203127393,
606-
264982119,
607-
2765226902,
608-
2737944514,
609-
3900253796));
601+
vec!(2558573138, 873787463, 263499565, 2103644246, 3595684709,
602+
4203127393, 264982119, 2765226902, 2737944514, 3900253796));
610603

611604
let seed: &[_] = &[12345, 67890, 54321, 9876];
612605
let mut rb: IsaacRng = SeedableRng::from_seed(seed);
@@ -617,33 +610,20 @@ mod tests {
617610

618611
let v = (0..10).map(|_| rb.next_u32()).collect::<Vec<_>>();
619612
assert_eq!(v,
620-
vec!(3676831399,
621-
3183332890,
622-
2834741178,
623-
3854698763,
624-
2717568474,
625-
1576568959,
626-
3507990155,
627-
179069555,
628-
141456972,
629-
2478885421));
613+
vec!(3676831399, 3183332890, 2834741178, 3854698763, 2717568474,
614+
1576568959, 3507990155, 179069555, 141456972, 2478885421));
630615
}
631616
#[test]
617+
#[rustfmt_skip]
632618
fn test_rng_64_true_values() {
633619
let seed: &[_] = &[1, 23, 456, 7890, 12345];
634620
let mut ra: Isaac64Rng = SeedableRng::from_seed(seed);
635621
// Regression test that isaac is actually using the above vector
636622
let v = (0..10).map(|_| ra.next_u64()).collect::<Vec<_>>();
637623
assert_eq!(v,
638-
vec!(547121783600835980,
639-
14377643087320773276,
640-
17351601304698403469,
641-
1238879483818134882,
642-
11952566807690396487,
643-
13970131091560099343,
644-
4469761996653280935,
645-
15552757044682284409,
646-
6860251611068737823,
624+
vec!(547121783600835980, 14377643087320773276, 17351601304698403469,
625+
1238879483818134882, 11952566807690396487, 13970131091560099343,
626+
4469761996653280935, 15552757044682284409, 6860251611068737823,
647627
13722198873481261842));
648628

649629
let seed: &[_] = &[12345, 67890, 54321, 9876];
@@ -655,16 +635,11 @@ mod tests {
655635

656636
let v = (0..10).map(|_| rb.next_u64()).collect::<Vec<_>>();
657637
assert_eq!(v,
658-
vec!(18143823860592706164,
659-
8491801882678285927,
660-
2699425367717515619,
661-
17196852593171130876,
662-
2606123525235546165,
663-
15790932315217671084,
664-
596345674630742204,
665-
9947027391921273664,
666-
11788097613744130851,
638+
vec!(18143823860592706164, 8491801882678285927, 2699425367717515619,
639+
17196852593171130876, 2606123525235546165, 15790932315217671084,
640+
596345674630742204, 9947027391921273664, 11788097613744130851,
667641
10391409374914919106));
642+
668643
}
669644

670645
#[test]

0 commit comments

Comments
 (0)