Move Equihash validator into zcash_primitives

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;
 

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]);