Skip to content

Commit cf62086

Browse files
committed
move rng to constructor
1 parent 8f880c0 commit cf62086

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

sv2/noise-sv2/benches/handshake.rs

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ fn bench_nx_handshake(c: &mut Criterion) {
2020
group.bench_function("step_1_responder", |b| {
2121
b.iter_batched(
2222
|| {
23-
let responder_key = generate_key_with_rng(&mut rng());
23+
let mut rng = rng();
24+
let responder_key = generate_key_with_rng(&mut rng);
2425
let mut initiator = Initiator::new(None);
2526
let responder = Responder::new(responder_key, 60);
2627

2728
let msg_0 = initiator.step_0().unwrap();
28-
(responder, msg_0)
29+
(responder, msg_0, rng)
2930
},
30-
|(mut responder, msg_0)| {
31-
let _ = responder
32-
.step_1_with_now_rng(msg_0, 10, &mut rng())
33-
.unwrap();
31+
|(mut responder, msg_0, mut rng)| {
32+
let _ = responder.step_1_with_now_rng(msg_0, 10, &mut rng).unwrap();
3433
},
3534
BatchSize::SmallInput,
3635
);
@@ -39,14 +38,13 @@ fn bench_nx_handshake(c: &mut Criterion) {
3938
group.bench_function("step_2_initiator", |b| {
4039
b.iter_batched(
4140
|| {
42-
let responder_key = generate_key_with_rng(&mut rng());
41+
let mut rng = rng();
42+
let responder_key = generate_key_with_rng(&mut rng);
4343
let mut initiator = Initiator::new(None);
4444
let mut responder = Responder::new(responder_key, 60);
4545

4646
let msg_0 = initiator.step_0().unwrap();
47-
let (msg_2, _) = responder
48-
.step_1_with_now_rng(msg_0, 10, &mut rng())
49-
.unwrap();
47+
let (msg_2, _) = responder.step_1_with_now_rng(msg_0, 10, &mut rng).unwrap();
5048

5149
(initiator, msg_2)
5250
},
@@ -60,16 +58,15 @@ fn bench_nx_handshake(c: &mut Criterion) {
6058
group.bench_function("handshake", |b| {
6159
b.iter_batched(
6260
|| {
63-
let responder_key = generate_key_with_rng(&mut rng());
61+
let mut rng = rng();
62+
let responder_key = generate_key_with_rng(&mut rng);
6463
let initiator = Initiator::new(None);
6564
let responder = Responder::new(responder_key, 60);
66-
(initiator, responder)
65+
(initiator, responder, rng)
6766
},
68-
|(mut initiator, mut responder)| {
67+
|(mut initiator, mut responder, mut rng)| {
6968
let msg_0 = initiator.step_0().unwrap();
70-
let (msg_2, _) = responder
71-
.step_1_with_now_rng(msg_0, 10, &mut rng())
72-
.unwrap();
69+
let (msg_2, _) = responder.step_1_with_now_rng(msg_0, 10, &mut rng).unwrap();
7370
let _ = initiator.step_2_with_now(msg_2, 10).unwrap();
7471
},
7572
BatchSize::SmallInput,

0 commit comments

Comments
 (0)