Move zcash_primitives::prover to sapling module

zcash_client_backend/src/data_api/wallet.rs

@@ -4,7 +4,7 @@ use std::fmt::Debug;
 use zcash_primitives::{
     consensus::{self, BranchId, NetworkUpgrade},
     memo::MemoBytes,
-    prover::TxProver,
+    sapling::prover::TxProver,
     transaction::{
         builder::Builder,
         components::{amount::DEFAULT_FEE, Amount},

zcash_client_sqlite/src/wallet/transact.rs

@@ -156,7 +156,7 @@ mod tests {
         consensus::BlockHeight,
         legacy::TransparentAddress,
         note_encryption::try_sapling_output_recovery,
-        prover::TxProver,
+        sapling::prover::TxProver,
         transaction::{components::Amount, Transaction},
         zip32::{ExtendedFullViewingKey, ExtendedSpendingKey},
     };

zcash_primitives/src/lib.rs

@@ -17,7 +17,6 @@ pub mod merkle_tree;
 pub mod note_encryption;
 pub mod pedersen_hash;
 pub mod primitives;
-pub mod prover;
 pub mod sapling;
 pub mod serialize;
 pub mod transaction;

zcash_primitives/src/sapling.rs

@@ -1,6 +1,7 @@
 //! Structs and constants specific to the Sapling shielded pool.
 
 pub mod group_hash;
+pub mod prover;
 pub mod redjubjub;
 
 use crate::{

zcash_primitives/src/transaction/builder.rs

@@ -18,8 +18,7 @@ use crate::{
     merkle_tree::MerklePath,
     note_encryption::SaplingNoteEncryption,
     primitives::{Diversifier, Note, PaymentAddress},
-    prover::TxProver,
-    sapling::{redjubjub::PrivateKey, spend_sig_internal, Node},
+    sapling::{prover::TxProver, redjubjub::PrivateKey, spend_sig_internal, Node},
     transaction::{
         components::{
             amount::Amount, amount::DEFAULT_FEE, OutputDescription, SpendDescription, TxOut,
@@ -43,7 +42,7 @@ use crate::{
 };
 
 #[cfg(any(test, feature = "test-dependencies"))]
-use crate::prover::mock::MockTxProver;
+use crate::sapling::prover::mock::MockTxProver;
 
 const DEFAULT_TX_EXPIRY_DELTA: u32 = 20;
 
@@ -966,8 +965,7 @@ mod tests {
         legacy::TransparentAddress,
         merkle_tree::{CommitmentTree, IncrementalWitness},
         primitives::Rseed,
-        prover::mock::MockTxProver,
-        sapling::Node,
+        sapling::{prover::mock::MockTxProver, Node},
         transaction::components::{amount::Amount, amount::DEFAULT_FEE},
         zip32::{ExtendedFullViewingKey, ExtendedSpendingKey},
     };

zcash_proofs/src/prover.rs

@@ -6,8 +6,8 @@ use std::path::Path;
 use zcash_primitives::{
     merkle_tree::MerklePath,
     primitives::{Diversifier, PaymentAddress, ProofGenerationKey, Rseed},
-    prover::TxProver,
     sapling::{
+        prover::TxProver,
         redjubjub::{PublicKey, Signature},
         Node,
     },