Hard-code NetworkUpgrade::Canopy in generate_random_rseed

zcash_client_backend/src/welding_rig.rs

@@ -191,7 +191,7 @@ mod tests {
     use pairing::bls12_381::{Bls12, Fr};
     use rand_core::{OsRng, RngCore};
     use zcash_primitives::{
-        consensus::{NetworkUpgrade, TestNetwork},
+        consensus::{TestNetwork},
         jubjub::{fs::Fs, FixedGenerators, JubjubParams, ToUniform},
         merkle_tree::CommitmentTree,
         note_encryption::{Memo, SaplingNoteEncryption},
@@ -255,11 +255,7 @@ mod tests {
 
         // Create a fake Note for the account
         let mut rng = OsRng;
-        let rseed = generate_random_rseed::<TestNetwork, OsRng>(
-            NetworkUpgrade::Canopy,
-            height as u32,
-            &mut rng,
-        );
+        let rseed = generate_random_rseed::<TestNetwork, OsRng>(height as u32, &mut rng);
         let note = Note {
             g_d: to.diversifier().g_d::<Bls12>(&JUBJUB).unwrap(),
             pk_d: to.pk_d().clone(),

zcash_client_sqlite/src/lib.rs

@@ -106,7 +106,6 @@ mod tests {
     };
     use zcash_primitives::{
         block::BlockHash,
-        consensus::NetworkUpgrade,
         note_encryption::{Memo, SaplingNoteEncryption},
         primitives::{Note, PaymentAddress},
         transaction::components::Amount,
@@ -127,11 +126,7 @@ mod tests {
 
         // Create a fake Note for the account
         let mut rng = OsRng;
-        let rseed = generate_random_rseed::<Network, OsRng>(
-            NetworkUpgrade::Canopy,
-            height as u32,
-            &mut rng,
-        );
+        let rseed = generate_random_rseed::<Network, OsRng>(height as u32, &mut rng);
         let note = Note {
             g_d: to.diversifier().g_d::<Bls12>(&JUBJUB).unwrap(),
             pk_d: to.pk_d().clone(),
@@ -181,11 +176,7 @@ mod tests {
         value: Amount,
     ) -> CompactBlock {
         let mut rng = OsRng;
-        let rseed = generate_random_rseed::<Network, OsRng>(
-            NetworkUpgrade::Canopy,
-            height as u32,
-            &mut rng,
-        );
+        let rseed = generate_random_rseed::<Network, OsRng>(height as u32, &mut rng);
 
         // Create a fake CompactBlock containing the note
         let mut cspend = CompactSpend::new();
@@ -222,11 +213,7 @@ mod tests {
         // Create a fake Note for the change
         ctx.outputs.push({
             let change_addr = extfvk.default_address().unwrap().1;
-            let rseed = generate_random_rseed::<Network, OsRng>(
-                NetworkUpgrade::Canopy,
-                height as u32,
-                &mut rng,
-            );
+            let rseed = generate_random_rseed::<Network, OsRng>(height as u32, &mut rng);
             let note = Note {
                 g_d: change_addr.diversifier().g_d::<Bls12>(&JUBJUB).unwrap(),
                 pk_d: change_addr.pk_d().clone(),

zcash_primitives/src/note_encryption.rs

@@ -799,8 +799,7 @@ mod tests {
         };
         let cv = value_commitment.cm(&JUBJUB).into();
 
-        let rseed =
-            generate_random_rseed::<TestNetwork, R>(NetworkUpgrade::Canopy, height, &mut rng);
+        let rseed = generate_random_rseed::<TestNetwork, R>(height, &mut rng);
 
         let note = pa.create_note(value, rseed, &JUBJUB).unwrap();
         let cmu = note.cm(&JUBJUB);

zcash_primitives/src/transaction/builder.rs

@@ -14,7 +14,7 @@ use std::marker::PhantomData;
 
 use crate::{
     consensus,
-    consensus::{MainNetwork, NetworkUpgrade, TestNetwork},
+    consensus::{MainNetwork, TestNetwork},
     keys::OutgoingViewingKey,
     legacy::TransparentAddress,
     merkle_tree::MerklePath,
@@ -105,7 +105,7 @@ impl SaplingOutput {
             return Err(Error::InvalidAmount);
         }
 
-        let rseed = generate_random_rseed::<P, R>(NetworkUpgrade::Canopy, height, rng);
+        let rseed = generate_random_rseed::<P, R>(height, rng);
 
         let note = Note {
             g_d,
@@ -633,11 +633,7 @@ impl<P: consensus::Parameters, R: RngCore + CryptoRng> Builder<P, R> {
                         }
                     };
 
-                    let rseed = generate_random_rseed::<P, R>(
-                        NetworkUpgrade::Canopy,
-                        self.height,
-                        &mut self.rng,
-                    );
+                    let rseed = generate_random_rseed::<P, R>(self.height, &mut self.rng);
 
                     (
                         payment_address,

zcash_primitives/src/util.rs

@@ -18,11 +18,10 @@ pub fn hash_to_scalar<E: JubjubEngine>(persona: &[u8], a: &[u8], b: &[u8]) -> E:
 }
 
 pub fn generate_random_rseed<P: consensus::Parameters, R: RngCore + CryptoRng>(
-    nu: NetworkUpgrade,
     height: u32,
     rng: &mut R,
 ) -> Rseed<Fs> {
-    if P::is_nu_active(nu, height) {
+    if P::is_nu_active(NetworkUpgrade::Canopy, height) {
         let mut buffer = [0u8; 32];
         &rng.fill_bytes(&mut buffer);
         Rseed::AfterZip212(buffer)