From 538de482f32ab3a687042fef4cb7cd554cdd9f78 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Sun, 6 Jan 2019 09:31:20 +0000
Subject: [PATCH] Update zcash_primitives crate to use ff crate

---
 Cargo.lock                                     | 1 +
 zcash_primitives/Cargo.toml                    | 1 +
 zcash_primitives/src/lib.rs                    | 1 +
 zcash_primitives/src/transaction/components.rs | 6 ++----
 zcash_primitives/src/transaction/sighash.rs    | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3715c7f..28ddb78 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -435,6 +435,7 @@ version = "0.0.0"
 dependencies = [
  "blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)",
  "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ff 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pairing 0.14.2",
  "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml
index bf6c03f..ac03334 100644
--- a/zcash_primitives/Cargo.toml
+++ b/zcash_primitives/Cargo.toml
@@ -7,6 +7,7 @@ authors = [
 
 [dependencies]
 byteorder = "1"
+ff = "0.4"
 lazy_static = "1"
 pairing = { path = "../pairing" }
 rand = "0.4"
diff --git a/zcash_primitives/src/lib.rs b/zcash_primitives/src/lib.rs
index 5f4dd05..6a84cc3 100644
--- a/zcash_primitives/src/lib.rs
+++ b/zcash_primitives/src/lib.rs
@@ -3,6 +3,7 @@ extern crate lazy_static;
 
 extern crate blake2_rfc;
 extern crate byteorder;
+extern crate ff;
 extern crate pairing;
 extern crate rand;
 extern crate sapling_crypto;
diff --git a/zcash_primitives/src/transaction/components.rs b/zcash_primitives/src/transaction/components.rs
index 21dbd46..39b468d 100644
--- a/zcash_primitives/src/transaction/components.rs
+++ b/zcash_primitives/src/transaction/components.rs
@@ -1,8 +1,6 @@
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
-use pairing::{
-    bls12_381::{Bls12, Fr, FrRepr},
-    PrimeField, PrimeFieldRepr,
-};
+use ff::{PrimeField, PrimeFieldRepr};
+use pairing::bls12_381::{Bls12, Fr, FrRepr};
 use sapling_crypto::{
     jubjub::{edwards, Unknown},
     redjubjub::{PublicKey, Signature},
diff --git a/zcash_primitives/src/transaction/sighash.rs b/zcash_primitives/src/transaction/sighash.rs
index e5dcde0..85302ee 100644
--- a/zcash_primitives/src/transaction/sighash.rs
+++ b/zcash_primitives/src/transaction/sighash.rs
@@ -1,6 +1,6 @@
 use blake2_rfc::blake2b::Blake2b;
 use byteorder::{LittleEndian, WriteBytesExt};
-use pairing::{PrimeField, PrimeFieldRepr};
+use ff::{PrimeField, PrimeFieldRepr};
 
 use super::{
     components::{Amount, Script, TxOut},