Move redjubjub into zcash_primitives

zcash_primitives/src/transaction/builder.rs

@@ -6,7 +6,6 @@ use rand::{rngs::OsRng, seq::SliceRandom, CryptoRng, RngCore};
 use sapling_crypto::{
     jubjub::fs::Fs,
     primitives::{Diversifier, Note, PaymentAddress},
-    redjubjub::PrivateKey,
 };
 use zip32::ExtendedSpendingKey;
 
@@ -16,6 +15,7 @@ use crate::{
     merkle_tree::{CommitmentTreeWitness, IncrementalWitness},
     note_encryption::{generate_esk, Memo, SaplingNoteEncryption},
     prover::TxProver,
+    redjubjub::PrivateKey,
     sapling::{spend_sig, Node},
     transaction::{
         components::{amount::DEFAULT_FEE, Amount, OutputDescription, SpendDescription, TxOut},

zcash_primitives/src/transaction/components.rs

@@ -1,13 +1,11 @@
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use ff::{PrimeField, PrimeFieldRepr};
 use pairing::bls12_381::{Bls12, Fr, FrRepr};
-use sapling_crypto::{
-    jubjub::{edwards, Unknown},
-    redjubjub::{PublicKey, Signature},
-};
+use sapling_crypto::jubjub::{edwards, Unknown};
 use std::io::{self, Read, Write};
 
 use legacy::Script;
+use redjubjub::{PublicKey, Signature};
 use JUBJUB;
 
 pub mod amount;

zcash_primitives/src/transaction/mod.rs

@@ -1,11 +1,11 @@
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use hex;
-use sapling_crypto::redjubjub::Signature;
 use sha2::{Digest, Sha256};
 use std::fmt;
 use std::io::{self, Read, Write};
 use std::ops::Deref;
 
+use redjubjub::Signature;
 use serialize::Vector;
 
 pub mod builder;

zcash_primitives/src/transaction/tests.rs

@@ -1,13 +1,11 @@
 use ff::Field;
 use pairing::bls12_381::Bls12;
 use rand_os::OsRng;
-use sapling_crypto::{
-    jubjub::{fs::Fs, FixedGenerators},
-    redjubjub::PrivateKey,
-};
+use sapling_crypto::jubjub::{fs::Fs, FixedGenerators};
 
 use super::{components::Amount, sighash::signature_hash, Transaction, TransactionData};
 use legacy::Script;
+use redjubjub::PrivateKey;
 use JUBJUB;
 
 #[test]