From d15acf8acc9b5acdd1b1c8655e12bda7c3d9672c Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 21 Aug 2020 18:33:22 +0100 Subject: [PATCH] zcash_primitives: Rename Note::cm to Note::cmu --- zcash_client_backend/src/welding_rig.rs | 2 +- zcash_client_sqlite/src/lib.rs | 6 +++--- zcash_primitives/src/note_encryption.rs | 10 +++++----- zcash_primitives/src/primitives.rs | 2 +- zcash_primitives/src/transaction/builder.rs | 20 ++++++++++---------- zcash_proofs/src/circuit/sapling.rs | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/zcash_client_backend/src/welding_rig.rs b/zcash_client_backend/src/welding_rig.rs index 7f43cb567..c654d31ad 100644 --- a/zcash_client_backend/src/welding_rig.rs +++ b/zcash_client_backend/src/welding_rig.rs @@ -263,7 +263,7 @@ mod tests { Memo::default(), &mut rng, ); - let cmu = note.cm().to_repr().as_ref().to_owned(); + let cmu = note.cmu().to_repr().as_ref().to_owned(); let epk = encryptor.epk().to_bytes().to_vec(); let enc_ciphertext = encryptor.encrypt_note_plaintext(); diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs index c0ec73d19..87327ee6a 100644 --- a/zcash_client_sqlite/src/lib.rs +++ b/zcash_client_sqlite/src/lib.rs @@ -139,7 +139,7 @@ mod tests { Memo::default(), &mut rng, ); - let cmu = note.cm().to_repr().as_ref().to_vec(); + let cmu = note.cmu().to_repr().as_ref().to_vec(); let epk = encryptor.epk().to_bytes().to_vec(); let enc_ciphertext = encryptor.encrypt_note_plaintext(); @@ -199,7 +199,7 @@ mod tests { Memo::default(), &mut rng, ); - let cmu = note.cm().to_repr().as_ref().to_vec(); + let cmu = note.cmu().to_repr().as_ref().to_vec(); let epk = encryptor.epk().to_bytes().to_vec(); let enc_ciphertext = encryptor.encrypt_note_plaintext(); @@ -227,7 +227,7 @@ mod tests { Memo::default(), &mut rng, ); - let cmu = note.cm().to_repr().as_ref().to_vec(); + let cmu = note.cmu().to_repr().as_ref().to_vec(); let epk = encryptor.epk().to_bytes().to_vec(); let enc_ciphertext = encryptor.encrypt_note_plaintext(); diff --git a/zcash_primitives/src/note_encryption.rs b/zcash_primitives/src/note_encryption.rs index a2bff59a8..64dd90f3d 100644 --- a/zcash_primitives/src/note_encryption.rs +++ b/zcash_primitives/src/note_encryption.rs @@ -212,7 +212,7 @@ pub fn prf_ock( /// }; /// let rcm = jubjub::Fr::random(&mut rng); /// let note = to.create_note(value, Rseed::BeforeZip212(rcm)).unwrap(); -/// let cmu = note.cm(); +/// let cmu = note.cmu(); /// /// let enc = SaplingNoteEncryption::new(ovk, note, to, Memo::default(), &mut rng); /// let encCiphertext = enc.encrypt_note_plaintext(); @@ -354,7 +354,7 @@ fn parse_note_plaintext_without_memo( let to = PaymentAddress::from_parts(diversifier, pk_d)?; let note = to.create_note(v, rseed).unwrap(); - if note.cm() != *cmu { + if note.cmu() != *cmu { // Published commitment doesn't match calculated commitment return None; } @@ -552,7 +552,7 @@ pub fn try_sapling_output_recovery_with_ock( let to = PaymentAddress::from_parts(diversifier, pk_d)?; let note = to.create_note(v, rseed).unwrap(); - if note.cm() != *cmu { + if note.cmu() != *cmu { // Published commitment doesn't match calculated commitment return None; } @@ -825,7 +825,7 @@ mod tests { let rseed = generate_random_rseed::(height, &mut rng); let note = pa.create_note(value, rseed).unwrap(); - let cmu = note.cm(); + let cmu = note.cmu(); let ovk = OutgoingViewingKey([0; 32]); let ne = SaplingNoteEncryption::new(ovk, note, pa, Memo([0; 512]), &mut rng); @@ -1781,7 +1781,7 @@ mod tests { let to = PaymentAddress::from_parts(Diversifier(tv.default_d), pk_d).unwrap(); let note = to.create_note(tv.v, Rseed::BeforeZip212(rcm)).unwrap(); - assert_eq!(note.cm(), cmu); + assert_eq!(note.cmu(), cmu); // // Test decryption diff --git a/zcash_primitives/src/primitives.rs b/zcash_primitives/src/primitives.rs index ba36a7dd8..7d9aa0533 100644 --- a/zcash_primitives/src/primitives.rs +++ b/zcash_primitives/src/primitives.rs @@ -276,7 +276,7 @@ impl Note { } /// Computes the note commitment - pub fn cm(&self) -> bls12_381::Scalar { + pub fn cmu(&self) -> bls12_381::Scalar { // The commitment is in the prime order subgroup, so mapping the // commitment to the u-coordinate is an injective encoding. jubjub::ExtendedPoint::from(self.cm_full_point()) diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs index 9bc3577db..af579716c 100644 --- a/zcash_primitives/src/transaction/builder.rs +++ b/zcash_primitives/src/transaction/builder.rs @@ -138,7 +138,7 @@ impl SaplingOutput { self.note.value, ); - let cmu = self.note.cm(); + let cmu = self.note.cmu(); let enc_ciphertext = encryptor.encrypt_note_plaintext(); let out_ciphertext = encryptor.encrypt_outgoing_plaintext(&cv, &cmu); @@ -368,7 +368,7 @@ impl Builder { merkle_path: MerklePath, ) -> Result<(), Error> { // Consistency check: all anchors must equal the first one - let cm = Node::new(note.cm().into()); + let cm = Node::new(note.cmu().into()); if let Some(anchor) = self.anchor { let path_root: bls12_381::Scalar = merkle_path.root(cm).into(); if path_root != anchor { @@ -635,7 +635,7 @@ impl Builder { dummy_note.value, ); - let cmu = dummy_note.cm(); + let cmu = dummy_note.cmu(); let mut enc_ciphertext = [0u8; 580]; let mut out_ciphertext = [0u8; 80]; @@ -780,9 +780,9 @@ mod tests { let note1 = to .create_note(50000, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng))) .unwrap(); - let cm1 = Node::new(note1.cm().to_repr()); + let cmu1 = Node::new(note1.cmu().to_repr()); let mut tree = CommitmentTree::new(); - tree.append(cm1).unwrap(); + tree.append(cmu1).unwrap(); let witness1 = IncrementalWitness::from_tree(&tree); let mut builder = Builder::::new(0); @@ -879,9 +879,9 @@ mod tests { let note1 = to .create_note(59999, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng))) .unwrap(); - let cm1 = Node::new(note1.cm().to_repr()); + let cmu1 = Node::new(note1.cmu().to_repr()); let mut tree = CommitmentTree::new(); - tree.append(cm1).unwrap(); + tree.append(cmu1).unwrap(); let mut witness1 = IncrementalWitness::from_tree(&tree); // Fail if there is insufficient input @@ -919,9 +919,9 @@ mod tests { let note2 = to .create_note(1, Rseed::BeforeZip212(jubjub::Fr::random(&mut rng))) .unwrap(); - let cm2 = Node::new(note2.cm().to_repr()); - tree.append(cm2).unwrap(); - witness1.append(cm2).unwrap(); + let cmu2 = Node::new(note2.cmu().to_repr()); + tree.append(cmu2).unwrap(); + witness1.append(cmu2).unwrap(); let witness2 = IncrementalWitness::from_tree(&tree); // Succeeds if there is sufficient input diff --git a/zcash_proofs/src/circuit/sapling.rs b/zcash_proofs/src/circuit/sapling.rs index 3e0eec78f..f8d7a6597 100644 --- a/zcash_proofs/src/circuit/sapling.rs +++ b/zcash_proofs/src/circuit/sapling.rs @@ -576,7 +576,7 @@ fn test_input_circuit_with_bls12_381() { }; let mut position = 0u64; - let cm = note.cm(); + let cm = note.cmu(); let mut cur = cm.clone(); for (i, val) in auth_path.clone().into_iter().enumerate() { @@ -757,7 +757,7 @@ fn test_input_circuit_with_bls12_381_external_test_vectors() { }; let mut position = 0u64; - let cm = note.cm(); + let cm = note.cmu(); let mut cur = cm.clone(); for (i, val) in auth_path.clone().into_iter().enumerate() { @@ -910,7 +910,7 @@ fn test_output_circuit_with_bls12_381() { Rseed::BeforeZip212(commitment_randomness), ) .expect("should be valid") - .cm(); + .cmu(); let expected_value_cm = jubjub::ExtendedPoint::from(value_commitment.cm()).to_affine();