From d78c94b2a24604f56dcc01aaea013825518c25a5 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Fri, 2 Aug 2019 10:50:32 +0100
Subject: [PATCH] Move Equihash validator into zcash_primitives

---
 librustzcash/src/rustzcash.rs                                | 3 +--
 zcash_primitives/src/block.rs                                | 2 ++
 {librustzcash/src => zcash_primitives/src/block}/equihash.rs | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename {librustzcash/src => zcash_primitives/src/block}/equihash.rs (100%)

diff --git a/librustzcash/src/rustzcash.rs b/librustzcash/src/rustzcash.rs
index 14b5f00..68b7048 100644
--- a/librustzcash/src/rustzcash.rs
+++ b/librustzcash/src/rustzcash.rs
@@ -45,6 +45,7 @@ use std::ffi::OsString;
 use std::os::windows::ffi::OsStringExt;
 
 use zcash_primitives::{
+    block::equihash,
     merkle_tree::CommitmentTreeWitness,
     note_encryption::sapling_ka_agree,
     primitives::{Diversifier, Note, PaymentAddress, ProofGenerationKey, ViewingKey},
@@ -58,8 +59,6 @@ use zcash_proofs::{
     sapling::{SaplingProvingContext, SaplingVerificationContext},
 };
 
-pub mod equihash;
-
 #[cfg(test)]
 mod tests;
 
diff --git a/zcash_primitives/src/block.rs b/zcash_primitives/src/block.rs
index f2802b4..63e6a05 100644
--- a/zcash_primitives/src/block.rs
+++ b/zcash_primitives/src/block.rs
@@ -6,6 +6,8 @@ use std::ops::Deref;
 
 use crate::serialize::Vector;
 
+pub mod equihash;
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct BlockHash(pub [u8; 32]);
 
diff --git a/librustzcash/src/equihash.rs b/zcash_primitives/src/block/equihash.rs
similarity index 100%
rename from librustzcash/src/equihash.rs
rename to zcash_primitives/src/block/equihash.rs