From 05dd729c70462beb3f30fe963f8af978a8945a61 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 26 Sep 2020 20:48:39 +0100 Subject: [PATCH] zcash_primitives: Fix note decryption benchmarks zcash/librustzcash#290 added a benchmark that relied on an API that was altered by zcash/librustzcash#261, but the PRs didn't cause merge conflicts, so the issue was only noticed once both had been merged. --- zcash_primitives/benches/note_decryption.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/zcash_primitives/benches/note_decryption.rs b/zcash_primitives/benches/note_decryption.rs index b4dfa6114..c0bc2420a 100644 --- a/zcash_primitives/benches/note_decryption.rs +++ b/zcash_primitives/benches/note_decryption.rs @@ -10,8 +10,9 @@ use zcash_primitives::{ }; fn bench_note_decryption(c: &mut Criterion) { + let params = TestNetwork; let mut rng = OsRng; - let height = TestNetwork::activation_height(Canopy).unwrap(); + let height = params.activation_height(Canopy).unwrap(); let valid_ivk = jubjub::Fr::random(&mut rng); let invalid_ivk = jubjub::Fr::random(&mut rng); @@ -22,7 +23,7 @@ fn bench_note_decryption(c: &mut Criterion) { let pk_d = diversifier.g_d().unwrap() * valid_ivk; let pa = PaymentAddress::from_parts(diversifier, pk_d).unwrap(); - let rseed = generate_random_rseed::(height, &mut rng); + let rseed = generate_random_rseed(¶ms, height, &mut rng); // Construct the value commitment for the proof instance let value = 100; @@ -54,7 +55,8 @@ fn bench_note_decryption(c: &mut Criterion) { group.bench_function("valid", |b| { b.iter(|| { - try_sapling_note_decryption::( + try_sapling_note_decryption( + &TestNetwork, height, &valid_ivk, &output.ephemeral_key, @@ -67,7 +69,8 @@ fn bench_note_decryption(c: &mut Criterion) { group.bench_function("invalid", |b| { b.iter(|| { - try_sapling_note_decryption::( + try_sapling_note_decryption( + &TestNetwork, height, &invalid_ivk, &output.ephemeral_key,