Merge pull request #95 from Duddino/fix-sapling-test-download

Fix sapling test download

Cargo.toml

@@ -43,7 +43,8 @@ rand_core = "0.6.4"
 atomic_float = "1.1.0"
 
 [dev-dependencies]
-tokio = { version = "1.40.0", features = ["full"] } 
+tokio = { version = "1.40.0", features = ["full"] }
+pivx_primitives = { git = "https://github.com/Duddino/librustpivx", default-features = false, features = ["transparent-inputs", "test-dependencies"] }
 wasm-bindgen-test = "0.3.13"
 
 [profile.release]

src/prover.rs

@@ -1,13 +1,25 @@
+use pivx_primitives::sapling::prover::TxProver;
+
+#[cfg(test)]
+use pivx_primitives::sapling::prover::mock::MockTxProver;
+#[cfg(not(test))]
 use pivx_proofs::prover::LocalTxProver;
+
 use reqwest::Client;
 use std::error::Error;
 use tokio::sync::OnceCell;
 use wasm_bindgen::prelude::*;
 
-static PROVER: OnceCell<LocalTxProver> = OnceCell::const_new();
+#[cfg(not(test))]
+type ImplTxProver = LocalTxProver;
+
+#[cfg(test)]
+type ImplTxProver = MockTxProver;
 
-pub async fn get_prover() -> &'static LocalTxProver {
-    let default_urls = &["https://https://pivxla.bz", "https://duddino.com"];
+static PROVER: OnceCell<ImplTxProver> = OnceCell::const_new();
+
+pub async fn get_prover() -> &'static impl TxProver {
+    let default_urls = &["https://pivxla.bz", "https://duddino.com"];
     for url in default_urls {
         if let Ok(prover) = get_with_url(url).await {
             return prover;
@@ -20,7 +32,8 @@ pub async fn get_prover() -> &'static LocalTxProver {
  * gets prover using the specified url. If the prover has already been downloaded
  * no request will be made
  */
-pub async fn get_with_url(url: &str) -> Result<&'static LocalTxProver, Box<dyn Error>> {
+#[cfg(not(test))]
+pub async fn get_with_url(url: &str) -> Result<&'static impl TxProver, Box<dyn Error>> {
     PROVER
         .get_or_try_init(|| async {
             let c = Client::new();
@@ -48,6 +61,11 @@ pub async fn get_with_url(url: &str) -> Result<&'static LocalTxProver, Box<dyn E
         .await
 }
 
+#[cfg(test)]
+pub async fn get_with_url(_url: &str) -> Result<&'static impl TxProver, Box<dyn Error>> {
+    Ok(PROVER.get_or_init(|| async { MockTxProver }).await)
+}
+
 #[wasm_bindgen]
 pub async fn load_prover() -> bool {
     get_prover().await;

src/transaction.rs

@@ -17,6 +17,7 @@ use crate::keys::GenericAddress;
 #[cfg(feature = "multicore")]
 use atomic_float::AtomicF32;
 pub use either::Either;
+use pivx_primitives::sapling::prover::TxProver;
 pub use pivx_primitives::sapling::{note::Note, Node, Nullifier};
 pub use pivx_primitives::transaction::builder::Builder;
 pub use pivx_primitives::transaction::components::Amount;
@@ -27,7 +28,6 @@ pub use pivx_primitives::zip32::AccountId;
 use pivx_primitives::zip32::ExtendedFullViewingKey;
 pub use pivx_primitives::zip32::ExtendedSpendingKey;
 pub use pivx_primitives::zip32::Scope;
-pub use pivx_proofs::prover::LocalTxProver;
 use rand_core::OsRng;
 
 use secp256k1::SecretKey;
@@ -550,7 +550,7 @@ fn prove_transaction(
     builder: Builder<'_, Network, OsRng>,
     nullifiers: Vec<String>,
     fee: u64,
-    prover: &LocalTxProver,
+    prover: &impl TxProver,
 ) -> Result<JSTransaction, Box<dyn Error>> {
     #[cfg(not(test))]
     return {