From f9ab9f2b368d544b1294bb606c7db381ad432064 Mon Sep 17 00:00:00 2001
From: Deirdre Connolly <deirdre@zfnd.org>
Date: Sun, 21 Feb 2021 22:07:12 -0500
Subject: [PATCH] Upgrade rand, rand_core, and rand_chacha together

---
 Cargo.toml     |  6 +++---
 tests/batch.rs | 34 +++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 17f6a886..2e6a4cde 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ blake2b_simd = "0.5"
 byteorder = "1.3"
 digest = "0.9"
 jubjub = "0.6"
-rand_core = "0.5"
+rand_core = "0.6"
 serde = { version = "1", optional = true, features = ["derive"] }
 thiserror = "1.0"
 zeroize = { version = "1", default-features = false, features = ["zeroize_derive"] }
@@ -35,8 +35,8 @@ bincode = "1"
 criterion = "0.3"
 lazy_static = "1.4"
 proptest = "1.0"
-rand = "0.7"
-rand_chacha = "0.2"
+rand = "0.8"
+rand_chacha = "0.3"
 
 [features]
 nightly = []
diff --git a/tests/batch.rs b/tests/batch.rs
index a3427e81..fe095ddf 100644
--- a/tests/batch.rs
+++ b/tests/batch.rs
@@ -4,13 +4,13 @@ use redjubjub::*;
 
 #[test]
 fn spendauth_batch_verify() {
-    let rng = thread_rng();
+    let mut rng = thread_rng();
     let mut batch = batch::Verifier::new();
     for _ in 0..32 {
-        let sk = SigningKey::<SpendAuth>::new(rng);
+        let sk = SigningKey::<SpendAuth>::new(&mut rng);
         let vk = VerificationKey::from(&sk);
         let msg = b"BatchVerifyTest";
-        let sig = sk.sign(rng, &msg[..]);
+        let sig = sk.sign(&mut rng, &msg[..]);
         batch.queue((vk.into(), sig, msg));
     }
     assert!(batch.verify(rng).is_ok());
@@ -18,13 +18,13 @@ fn spendauth_batch_verify() {
 
 #[test]
 fn binding_batch_verify() {
-    let rng = thread_rng();
+    let mut rng = thread_rng();
     let mut batch = batch::Verifier::new();
     for _ in 0..32 {
-        let sk = SigningKey::<Binding>::new(rng);
+        let sk = SigningKey::<Binding>::new(&mut rng);
         let vk = VerificationKey::from(&sk);
         let msg = b"BatchVerifyTest";
-        let sig = sk.sign(rng, &msg[..]);
+        let sig = sk.sign(&mut rng, &msg[..]);
         batch.queue((vk.into(), sig, msg));
     }
     assert!(batch.verify(rng).is_ok());
@@ -32,22 +32,22 @@ fn binding_batch_verify() {
 
 #[test]
 fn alternating_batch_verify() {
-    let rng = thread_rng();
+    let mut rng = thread_rng();
     let mut batch = batch::Verifier::new();
     for i in 0..32 {
         let item: batch::Item = match i % 2 {
             0 => {
-                let sk = SigningKey::<SpendAuth>::new(rng);
+                let sk = SigningKey::<SpendAuth>::new(&mut rng);
                 let vk = VerificationKey::from(&sk);
                 let msg = b"BatchVerifyTest";
-                let sig = sk.sign(rng, &msg[..]);
+                let sig = sk.sign(&mut rng, &msg[..]);
                 (vk.into(), sig, msg).into()
             }
             1 => {
-                let sk = SigningKey::<Binding>::new(rng);
+                let sk = SigningKey::<Binding>::new(&mut rng);
                 let vk = VerificationKey::from(&sk);
                 let msg = b"BatchVerifyTest";
-                let sig = sk.sign(rng, &msg[..]);
+                let sig = sk.sign(&mut rng, &msg[..]);
                 (vk.into(), sig, msg).into()
             }
             _ => unreachable!(),
@@ -59,28 +59,28 @@ fn alternating_batch_verify() {
 
 #[test]
 fn bad_batch_verify() {
-    let rng = thread_rng();
+    let mut rng = thread_rng();
     let bad_index = 4; // must be even
     let mut batch = batch::Verifier::new();
     let mut items = Vec::new();
     for i in 0..32 {
         let item: batch::Item = match i % 2 {
             0 => {
-                let sk = SigningKey::<SpendAuth>::new(rng);
+                let sk = SigningKey::<SpendAuth>::new(&mut rng);
                 let vk = VerificationKey::from(&sk);
                 let msg = b"BatchVerifyTest";
                 let sig = if i != bad_index {
-                    sk.sign(rng, &msg[..])
+                    sk.sign(&mut rng, &msg[..])
                 } else {
-                    sk.sign(rng, b"bad")
+                    sk.sign(&mut rng, b"bad")
                 };
                 (vk.into(), sig, msg).into()
             }
             1 => {
-                let sk = SigningKey::<Binding>::new(rng);
+                let sk = SigningKey::<Binding>::new(&mut rng);
                 let vk = VerificationKey::from(&sk);
                 let msg = b"BatchVerifyTest";
-                let sig = sk.sign(rng, &msg[..]);
+                let sig = sk.sign(&mut rng, &msg[..]);
                 (vk.into(), sig, msg).into()
             }
             _ => unreachable!(),