Move Jubjub, Pedersen hash and primitives into zcash_primitives

zcash_proofs/src/sapling/mod.rs

@@ -1,5 +1,5 @@
 use pairing::bls12_381::Bls12;
-use sapling_crypto::jubjub::{
+use zcash_primitives::jubjub::{
     edwards, fs::FsRepr, FixedGenerators, JubjubBls12, JubjubParams, Unknown,
 };
 use zcash_primitives::transaction::components::Amount;

zcash_proofs/src/sapling/prover.rs

@@ -7,7 +7,7 @@ use bellman::{
 use ff::Field;
 use pairing::bls12_381::{Bls12, Fr};
 use rand_os::OsRng;
-use sapling_crypto::{
+use zcash_primitives::{
     jubjub::{edwards, fs::Fs, FixedGenerators, JubjubBls12, Unknown},
     primitives::{Diversifier, Note, PaymentAddress, ProofGenerationKey, ValueCommitment},
 };

zcash_proofs/src/sapling/verifier.rs

@@ -4,7 +4,7 @@ use bellman::{
 };
 use ff::Field;
 use pairing::bls12_381::{Bls12, Fr};
-use sapling_crypto::jubjub::{edwards, FixedGenerators, JubjubBls12, Unknown};
+use zcash_primitives::jubjub::{edwards, FixedGenerators, JubjubBls12, Unknown};
 use zcash_primitives::{
     redjubjub::{PublicKey, Signature},
     transaction::components::Amount,