Rename proving key to proof generation key to disambiguate from the SNARK.

src/circuit/mod.rs

@@ -118,7 +118,7 @@ impl<'a, E: JubjubEngine> Circuit<E> for Spend<'a, E> {
 
             rk = ecc::fixed_base_multiplication(
                 cs.namespace(|| "computation of rk"),
-                FixedGenerators::ProvingPublicKey,
+                FixedGenerators::ProofGenerationKey,
                 &rsk,
                 self.params
             )?;

src/jubjub/mod.rs

@@ -41,7 +41,7 @@ pub enum FixedGenerators {
     /// The prover will demonstrate knowledge of discrete log
     /// with respect to this base when they are constructing
     /// a proof, in order to authorize proof construction.
-    ProvingPublicKey = 0,
+    ProofGenerationKey = 0,
 
     /// The note commitment is randomized over this generator.
     NoteCommitmentRandomness = 1,
@@ -225,8 +225,8 @@ impl JubjubBls12 {
                 // way to iterate over the variants of an enum, so it's hideous.
                 for c in 0..(FixedGenerators::Max as usize) {
                     let p = match c {
-                        c if c == (FixedGenerators::ProvingPublicKey as usize) => {
-                            ::PROVING_KEY_BASE_GENERATOR_PERSONALIZATION
+                        c if c == (FixedGenerators::ProofGenerationKey as usize) => {
+                            ::PROOF_GENERATION_KEY_BASE_GENERATOR_PERSONALIZATION
                         },
                         c if c == (FixedGenerators::NoteCommitmentRandomness as usize) => {
                             ::NOTE_COMMITMENT_RANDOMNESS_GENERATOR_PERSONALIZATION

src/lib.rs

@@ -26,7 +26,7 @@ const PRF_NR_PERSONALIZATION: &'static [u8; 8]  = b"WhatTheH";
 /// BLAKE2s Personalization for Pedersen hash generators.
 const PEDERSEN_HASH_GENERATORS_PERSONALIZATION: &'static [u8; 8] = b"PEDERSEN";
 /// BLAKE2s Personalization for the proof generation key base point
-const PROVING_KEY_BASE_GENERATOR_PERSONALIZATION: &'static [u8; 8] = b"12345678";
+const PROOF_GENERATION_KEY_BASE_GENERATOR_PERSONALIZATION: &'static [u8; 8] = b"12345678";
 /// BLAKE2s Personalization for the note commitment randomness generator
 const NOTE_COMMITMENT_RANDOMNESS_GENERATOR_PERSONALIZATION: &'static [u8; 8] = b"abcdefgh";
 /// BLAKE2s Personalization for the nullifier position generator (for PRF^nr)