Make zcash_primitives::JUBJUB the canonical instantiation of JubjubBls12

zip32/Cargo.toml

@@ -16,9 +16,9 @@ aes = "0.2"
 byteorder = "1"
 ff = { path = "../ff" }
 fpe = "0.1"
-lazy_static = "1.0"
 pairing = { path = "../pairing" }
 sapling-crypto = { path = "../sapling-crypto" }
+zcash_primitives = { path = "../zcash_primitives" }
 
 [dependencies.blake2-rfc]
 git = "https://github.com/gtank/blake2-rfc"

zip32/src/lib.rs

@@ -3,10 +3,9 @@ extern crate blake2_rfc;
 extern crate byteorder;
 extern crate ff;
 extern crate fpe;
-#[macro_use]
-extern crate lazy_static;
 extern crate pairing;
 extern crate sapling_crypto;
+extern crate zcash_primitives;
 
 use aes::Aes256;
 use blake2_rfc::blake2b::{Blake2b, Blake2bResult};
@@ -15,16 +14,11 @@ use ff::{Field, PrimeField, PrimeFieldRepr};
 use fpe::ff1::{BinaryNumeralString, FF1};
 use pairing::bls12_381::Bls12;
 use sapling_crypto::{
-    jubjub::{
-        edwards, FixedGenerators, JubjubBls12, JubjubEngine, JubjubParams, ToUniform, Unknown,
-    },
+    jubjub::{edwards, FixedGenerators, JubjubEngine, JubjubParams, ToUniform, Unknown},
     primitives::{Diversifier, PaymentAddress, ViewingKey},
 };
 use std::io::{self, Read, Write};
-
-lazy_static! {
-    static ref JUBJUB: JubjubBls12 = { JubjubBls12::new() };
-}
+use zcash_primitives::JUBJUB;
 
 pub const PRF_EXPAND_PERSONALIZATION: &'static [u8; 16] = b"Zcash_ExpandSeed";
 pub const ZIP32_SAPLING_MASTER_PERSONALIZATION: &'static [u8; 16] = b"ZcashIP32Sapling";