Use the bundled prover rather than local params files for testing by default.

`fetch_params.sh` is now deprecated and the bundled proving parameters
from `wagyu-zcash-parameters` are used everywhere, so the tests should
follow suit.

Fixes #1016
This commit is contained in:
Kris Nuttycombe 2023-10-11 14:36:10 -06:00
parent 7154e65864
commit e27dcf498e
3 changed files with 3 additions and 12 deletions

View File

@ -61,7 +61,7 @@ rand_core.workspace = true
regex = "1.4" regex = "1.4"
tempfile = "3.5.0" tempfile = "3.5.0"
zcash_note_encryption.workspace = true zcash_note_encryption.workspace = true
zcash_proofs = { workspace = true, features = ["local-prover"] } zcash_proofs = { workspace = true, features = ["bundled-prover"] }
zcash_primitives = { workspace = true, features = ["test-dependencies"] } zcash_primitives = { workspace = true, features = ["test-dependencies"] }
zcash_client_backend = { workspace = true, features = ["test-dependencies", "unstable-serialization", "unstable-spanning-tree"] } zcash_client_backend = { workspace = true, features = ["test-dependencies", "unstable-serialization", "unstable-spanning-tree"] }
zcash_address = { workspace = true, features = ["test-dependencies"] } zcash_address = { workspace = true, features = ["test-dependencies"] }

View File

@ -499,12 +499,7 @@ pub(crate) mod tests {
}; };
pub(crate) fn test_prover() -> impl SpendProver + OutputProver { pub(crate) fn test_prover() -> impl SpendProver + OutputProver {
match LocalTxProver::with_default_location() { LocalTxProver::bundled()
Some(tx_prover) => tx_prover,
None => {
panic!("Cannot locate the Zcash parameters. Please run zcash-fetch-params or fetch-params.sh to download the parameters, and then re-run the tests.");
}
}
} }
#[test] #[test]

View File

@ -796,11 +796,7 @@ mod tests {
.activation_height(NetworkUpgrade::ZFuture) .activation_height(NetworkUpgrade::ZFuture)
.unwrap(); .unwrap();
// Only run the test if we have the prover parameters. let prover = LocalTxProver::bundled();
let prover = match LocalTxProver::with_default_location() {
Some(prover) => prover,
None => return,
};
// //
// Opening transaction // Opening transaction